Changeset 6151 in orxonox.OLD for trunk/src/story_entities/world.cc

Timestamp:

Dec 17, 2005, 6:08:28 PM (18 years ago)

Author:

bensch

Message:

trunk: more world cleanup

File:

• trunk/src/story_entities/world.cc (modified) (5 diffs)

trunk/src/story_entities/world.cc

@@ -28 +28 @@
 #include "camera.h"
 #include "environment.h"
+#include "terrain.h"
 
 #include "test_entity.h"
@@ -405 +406 @@
 ErrorMessage World::start()
 {
-  this->bQuitOrxonox = false;
-  this->bQuitCurrentGame = false;
+  this->bQuitWorld = false;
   this->mainLoop();
 }
@@ -418 +418 @@
 {
   PRINTF(3)("World::stop() - got stop signal\n");
-  this->bQuitCurrentGame = true;
+  this->bQuitWorld= true;
 }
 
@@ -669 +669 @@
   PRINTF(3)("World::mainLoop() - Entering main loop\n");
 
-  while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* @todo implement pause */
+  while(!this->bQuitWorld) /* @todo implement pause */
   {
     ++this->cycle;
@@ -676 +676 @@
       // Process input
     this->handleInput ();
-    if( this->bQuitCurrentGame || this->bQuitOrxonox)
+    if( this->bQuitWorld)
       break;
       // Process time