Changeset 9988 in orxonox.OLD for branches/coll_rect/src/world_entities/world_entity.h

Timestamp:

Dec 3, 2006, 4:55:19 PM (17 years ago)

Author:

patrick

Message:

removed most of the compiler bugs. more to come

File:

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

branches/coll_rect/src/world_entities/world_entity.h

@@ -88 +88 @@
   void unsubscribeReactions();
 
-  inline bool isSubscribed(CoRe::CREngine::ReactionType type) const { return this->_collisionFilter.isSubscribed( type); }
-
   /** @return true if there is at least on collision reaction subscribed */
-  inline bool isReactive() const { return this->bReactive; }
+  inline bool isReactive() const { return this->_collisionFilter.isReactive(); }
 
   /** @param worldEntity the world entity to be checked @returns true if there is a collisionreaction registered for the worldEntity */
-  inline bool isReactive( const WorldEntity& worldEntity) const { return this->isReactive() || (this->_collisionFilter(worldEntity)); }
+  inline bool isReactive( const WorldEntity& worldEntity) const { return this->_collisionFilter.isReactive() || (this->_collisionFilter(worldEntity)); }
   /** @param worldEntity the world entity to be checked @param type special reaction type @returns true if collision reaction reg. */
-  inline bool isReactive( const WorldEntity& worldEntity, CoRe::CREngine::ReactionType type) const
-  { return this->isReactive() || (this->_collisionFilter(worldEntity, type)); }
+  inline bool isReactive( const WorldEntity& worldEntity, const CoRe::CREngine::ReactionType& type) const
+  { return this->_collisionFilter.isReactive() || (this->_collisionFilter(worldEntity, type)); }
 
 
@@ -103 +101 @@
 
   /** @returns true if this entity is standing on ground (BSP model) */
-  bool isOnGround() const { return this->bOnGround; }
+  bool isOnGround() const { return this->_bOnGround; }
   /** @param flag: marks if this entity is standing on ground */
-  void setOnGround(bool flag) { this->bOnGround = flag; }
+  void setOnGround(bool flag) { this->_bOnGround = flag; }
 
   virtual void destroy( WorldEntity* killer );
@@ -201 +199 @@
   /* collision reaction stuff */
   CoRe::CollisionFilter   _collisionFilter;                //!< filter for collision event filtering (not every entity listens to all collisions)
-  bool                    bReactive;                       //!< true if there is at least one collision reaction subscibed
-
+  bool                    _bOnGround;                      //!< flag true if the object is on the ground
 
   PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity
-  bool                    bOnGround;                       //!< true if this entity is standing on the ground
 
   /* network help structures */