Changeset 4830 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Jul 11, 2005, 5:43:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented aim

File:

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

orxonox/trunk/src/story_entities/world.cc

@@ -186 +186 @@
 
   delete WorldInterface::getInstance();
-  delete this->nullParent;
+  delete NullParent::getInstance();
   delete this->entities;
+  State::setWorldEntityList(NULL);
+
+
   delete LightManager::getInstance();
   delete TrackManager::getInstance();
@@ -194 +197 @@
   TextEngine::getInstance()->flush();
   SoundEngine::getInstance()->flushAllBuffers();
+  SoundEngine::getInstance()->flushAllSources();
 
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
@@ -203 +207 @@
 
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
+
+
+
+  crosshair=NULL;
 }
 
@@ -238 +246 @@
   LoadParam<World>(root, "path", this, &World::setPath)
     .describe("The Filename of this World (relative from the data-dir)");
-
-  if (!crosshair)
-    crosshair = new Crosshair();
 }
 
@@ -273 +278 @@
 
   GraphicsEngine::getInstance()->displayFPS(true);
+
+  if (!crosshair)
+    crosshair = new Crosshair();
 }
 
@@ -849 +857 @@
   glCallList (objectList);
 
-  ParticleEngine::getInstance()->draw(); //!< \todo should be dts like in the Trunk;
+  ParticleEngine::getInstance()->draw();
+
+  crosshair->draw();
 
   TextEngine::getInstance()->draw();
   LightManager::getInstance()->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
-  crosshair->draw();
 }