Changeset 4829 in orxonox.OLD

Timestamp:

Jul 9, 2005, 1:11:08 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: shoots are visible again

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (2 diffs)
• world_entities/weapons/test_gun.cc (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -222 +222 @@
   //strcpy(this->worldName, name);
   this->debugWorldNr = worldID;
-  State::setWorldEntityList(this->entities = new tList<WorldEntity>());
-  this->cycle = 0;
-
 }
 
@@ -255 +252 @@
 ErrorMessage World::preLoad()
 {
+  State::setWorldEntityList(this->entities = new tList<WorldEntity>());
+  this->cycle = 0;
+
+
   /* init the world interface */
   WorldInterface* wi = WorldInterface::getInstance();

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -23 +23 @@
 #include "test_gun.h"
 
-#include "stdincl.h"
 #include "world_entity.h"
 #include "model.h"
 #include "test_bullet.h"
 
+#include "state.h"
 #include "vector.h"
 #include "list.h"
@@ -157 +157 @@
   pj->setAbsDir(this->getAbsDir());
   pj->setVelocity(this->getVelocity());
-  this->worldEntities->add(pj);
+  State::getWorldEntityList()->add(pj);
   this->localTime = 0;