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

Timestamp:

Dec 4, 2006, 2:24:40 PM (18 years ago)

Author:

patrick

Message:

removed many very heavy segfaults

File:

• branches/coll_rect/src/world_entities/world_entity.h (modified) (1 diff)

branches/coll_rect/src/world_entities/world_entity.h

@@ -92 +92 @@
 
   /** @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->_collisionFilter.isReactive() || (this->_collisionFilter(worldEntity)); }
+  inline bool isReactive( const WorldEntity& worldEntity) const { return 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, const CoRe::CREngine::ReactionType& type) const
-  { return this->_collisionFilter.isReactive() || (this->_collisionFilter(worldEntity, type)); }
+  { return this->_collisionFilter(worldEntity, type); }