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

Timestamp:

Dec 19, 2004, 9:09:36 PM (21 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed a lot of bugs with StoryEntity management, also cleared up some old unused code

File:

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

orxonox/trunk/src/world.cc

@@ -51 +51 @@
 World::~World ()
 {
-  Orxonox *orx = Orxonox::getInstance();
-  orx->get_localinput()->unbind (this->localPlayer);
-  delete this->entities;
-  delete this->localCamera;
-}
-
-
-/** 
-    \brief initialize the world before use.
-*/
-Error World::init()
-{
-  this->bPause = false;
+  printf("World::~World() - deleting current world\n");
   CommandNode* cn = Orxonox::getInstance()->get_localinput();
-  cn->addToWorld(this);
-  cn->enable(true);
-}
-
-Error World::start()
-{
-  this->mainLoop();
-}
-
-Error World::stop()
-{
-  this->bQuitCurrentGame = true;
-  //this->localCamera->setWorld(NULL);
-  this->localPlayer->destroy();
+  cn->unbind(this->localPlayer);
+  cn->reset();
   this->localCamera->destroy();
 
@@ -88 +64 @@
     }
   this->entities->destroy();
-  Orxonox::getInstance()->get_localinput()->reset();
+
+  delete this->entities;
+  delete this->localCamera;
+  /* this->localPlayer hasn't to be deleted explicitly, it is 
+     contained in entities*/
+}
+
+
+/** 
+    \brief initialize the world before use.
+*/
+Error World::init()
+{
+  this->bPause = false;
+  CommandNode* cn = Orxonox::getInstance()->get_localinput();
+  cn->addToWorld(this);
+  cn->enable(true);
+}
+
+Error World::start()
+{
+  printf("World::start() - starting current World: nr %i\n", this->debugWorldNr);
+  this->bQuitOrxonox = false;
+  this->bQuitCurrentGame = false;
+  this->mainLoop();
+}
+
+Error World::stop()
+{
+  printf("World::stop() - got stop signal\n");
+  this->bQuitCurrentGame = true;
 }
 
@@ -568 +574 @@
 {
   this->lastFrame = SDL_GetTicks();
-  this->bQuitOrxonox = false;
-  this->bQuitCurrentGame = false;
-  printf("World|Entering main loop\n");
+  printf("World::mainLoop() - Entering main loop\n");
   while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* \todo implement pause */
     {
@@ -740 +744 @@
 bool World::command(Command* cmd)
 {
-  if( !strcmp( cmd->cmd, "quit"))
-    {
-      if( !cmd->bUp) this->stop();
-      return true;
-    }
   return false;
 }