Changeset 3215 in orxonox.OLD for orxonox/trunk/src/world.cc

Timestamp:

Dec 18, 2004, 4:10:05 AM (19 years ago)

Author:

patrick

Message:

/orxonox/trunk: discovered a minor bug and fixed some code style issues…

File:

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

orxonox/trunk/src/world.cc

@@ -75 +75 @@
 {
   this->bQuitCurrentGame = true;
-  this->localCamera->setWorld(NULL);
+  //this->localCamera->setWorld(NULL);
+  this->localPlayer->destroy();
   this->localCamera->destroy();
 
@@ -569 +570 @@
   this->bQuitCurrentGame = false;
   printf("World|Entering main loop\n");
-  while(!this->bQuitOrxonox && !this->bQuitCurrentGame) /* pause pause pause ?!?!?*/
+  while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* \todo implement pause */
     {
       //debug routine
@@ -577 +578 @@
       // Process input
       handle_input();
+      if( this->bQuitCurrentGame || this->bQuitOrxonox)
+        {
+          printf("World::mainLoop() - leaving loop earlier...\n");
+          break;
+        }
       // Process time
       time_slice();
@@ -586 +592 @@
       for(int i = 0; i < 10000000; i++) {}
     }
-  printf("World|Exiting the main loop\n");
+  printf("World::mainLoop() - Exiting the main loop\n");
 }
 
@@ -655 +661 @@
     {
       if( !cmd->bUp) this->bQuitOrxonox = true;
-      return true;
+      {
+        printf("World::system_command() - rescv quit command\n");
+        return true;
+      }
     }
   return false;