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

Timestamp:

Jul 11, 2005, 5:47:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: crosshair in WeaponManager (instead of World) and implemented easy Cyling for LoadParam

File:

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

orxonox/trunk/src/story_entities/world.cc

@@ -69 +69 @@
 #include "class_list.h"
 
-#include "crosshair.h"
-Crosshair* crosshair=NULL;
-
 
 using namespace std;
@@ -207 +204 @@
 
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
-
-
-
-  crosshair=NULL;
 }
 
@@ -242 +235 @@
   LoadParam<World>(root, "identifier", this, &World::setStoryID)
     .describe("Sets the StoryID of this world");
+
   LoadParam<World>(root, "nextid", this, &World::setNextStoryID)
     .describe("Sets the ID of the next world");
+
   LoadParam<World>(root, "path", this, &World::setPath)
     .describe("The Filename of this World (relative from the data-dir)");
@@ -278 +273 @@
 
   GraphicsEngine::getInstance()->displayFPS(true);
-
-  if (!crosshair)
-    crosshair = new Crosshair();
 }
 
@@ -859 +851 @@
   ParticleEngine::getInstance()->draw();
 
-  crosshair->draw();
 
   TextEngine::getInstance()->draw();
@@ -1055 +1046 @@
 
 
-      crosshair->tick(this->dtS);
-
       /** actualy the Graphics Engine should tick the world not the other way around...
          but since we like the things not too complicated we got it this way around