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

Timestamp:

Jun 29, 2006, 12:19:48 AM (19 years ago)

Author:

patrick

Message:

merged the branche single_player_map with the trunk

File:

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

trunk/src/world_entities/world_entity.h

@@ -88 +88 @@
 
   bool registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
-  bool registerCollision(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position);
+  bool registerCollision(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall = false);
   /** @return true if there is at least on collision reaction subscribed */
   inline bool isReactive() const { return this->bReactive; }
@@ -115 +115 @@
   /** @returns a Reference to the Iterator */
   ObjectManager::EntityList::iterator& getEntityIterator() { return this->objectListIterator; }
+
+  void hide() { if( this->objectListNumber != OM_DEAD) this->lastObjectListNumber = this->objectListNumber; this->toList(OM_DEAD); }
+  void unhide() { this->toList(this->lastObjectListNumber); }
+
 
   /* --- Character Attribute Block --- */
@@ -176 +180 @@
   OM_LIST                 objectListNumber;                //!< The ObjectList from ObjectManager this Entity is in.
   ObjectManager::EntityList::iterator objectListIterator;  //!< The iterator position of this Entity in the given list of the ObjectManager.
+  OM_LIST                 lastObjectListNumber;            //!< the last ObjectList from the ObjectManager this Entity was is in