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

Timestamp:

Jul 2, 2006, 1:36:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

File:

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

trunk/src/world_entities/world_entity.h

@@ -94 +94 @@
   CollisionHandle* getCollisionHandle(CREngine::CRType type) const { return this->collisionHandles[type]; }
 
+  /** @returns true if this entity is standing on ground (BSP model) */
+  bool isOnGround() const { return this->bOnGround; }
+  /** @param flag: marks if this entity is standing on ground */
+  void setOnGround(bool flag) { this->bOnGround = flag; }
+
   virtual void hit(float damage);
   virtual void destroy();
@@ -117 +122 @@
 
   void hide() { if( this->objectListNumber != OM_DEAD) this->lastObjectListNumber = this->objectListNumber; this->toList(OM_DEAD); }
-  void unhide() { this->toList(this->lastObjectListNumber); }
+  void unhide() { if( this->objectListNumber != this->lastObjectListNumber) this->toList(this->lastObjectListNumber); }
 
 
@@ -194 +199 @@
 
   PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity
-
+  bool                    bOnGround;                       //!< true if this entity is standing on the ground
 
   protected: