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

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

File:

• trunk/src/world_entities/world_entity.h (modified) (2 diffs)

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;