Changeset 7370 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Apr 26, 2006, 1:31:01 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: drawLists/tickLists are used, and made some TiXmlElement to const TiXmlElement, also fixed some bugs in the loadWorldEntities-functions from Gameworld and SipleGameMenu

Location:

trunk/src/world_entities

Files:

• environments/water.cc (modified) (1 diff)
• power_ups/weapon_power_up.cc (modified) (1 diff)
• spawning_point.h (modified) (1 diff)
• weapons/aim.cc (modified) (1 diff)
• world_entity.h (modified) (2 diffs)

trunk/src/world_entities/environments/water.cc

@@ -211 +211 @@
 void Water::tick(float dt)
 {
-  std::list<WorldEntity*> entityList = State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ);
-  std::list<WorldEntity*>::iterator entity = entityList.begin();
+  ObjectManager::EntityList entityList = State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ);
+  ObjectManager::EntityList::iterator entity = entityList.begin();
   while (entity != entityList.end())
   {

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -88 +88 @@
   this->weapon = dynamic_cast<Weapon*>((weaponXML == NULL)
       ? Factory::fabricate(static_cast<ClassID>(this->weapon->getLeafClassID()))
-      : Factory::fabricate((TiXmlElement*)this->getXmlElem()->FirstChildElement("weapon")));
+      : Factory::fabricate((const TiXmlElement*)this->getXmlElem()->FirstChildElement("weapon")));
   this->model = this->weapon->getModel(0);
 }

trunk/src/world_entities/spawning_point.h

@@ -70 +70 @@
     ClassID                   classID;                        //!< the classid of the entity to spawn
     SpawningPointMode         mode;                           //!< the mode of the spawning point
-    std::list<WorldEntity*>   queue;                          //!< queue of waiting WorldEntities to be spawned
+    ObjectManager::EntityList   queue;                          //!< queue of waiting WorldEntities to be spawned
     bool                      bSpawning;                      //!< flag to indicate if this spawning point is active or not
 };

trunk/src/world_entities/weapons/aim.cc

@@ -107 +107 @@
 void Aim::searchTarget()
 {
-  std::list<WorldEntity*>::iterator entity;
+  ObjectManager::EntityList::iterator entity;
 
   for (entity = State::getObjectManager()->getObjectList(group).begin();

trunk/src/world_entities/world_entity.h

@@ -82 +82 @@
   OM_LIST& getOMListNumber() { return this->objectListNumber; }
   /** @returns a Reference to the Iterator */
-  std::list<WorldEntity*>::iterator& getEntityIterator() { return this->objectListIterator; }
+  ObjectManager::EntityList::iterator& getEntityIterator() { return this->objectListIterator; }
 
   int       writeState(const byte* data, int length, int sender);
@@ -121 +121 @@
 
   OM_LIST                           objectListNumber;   //!< The ObjectList from ObjectManager this Entity is in.
-  std::list<WorldEntity*>::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager.
+  ObjectManager::EntityList::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager.
 
   float                   scaling;