Changeset 9986 in orxonox.OLD

Timestamp:

Dec 2, 2006, 6:47:40 PM (17 years ago)

Author:

patrick

Message:

fixed a compile bug… more to come but not today:)

Location:

branches/coll_rect/src

Files:

• lib/collision_reaction/collision_tube.h (modified) (1 diff)
• lib/collision_reaction/cr_engine.h (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

branches/coll_rect/src/lib/collision_reaction/collision_tube.h

@@ -69 +69 @@
 
     /** @returns an iterator pointing to the beginning of the list */
-    CollisionIterator& begin() const { return this->_collisionList.begin(); }
+    CollisionIterator& begin() { return this->_collisionList.begin(); }
     /** @returns an iterator pointing to the end of the list */
-    CollisionIterator& end()   const { return this->_collisionList.end(); }
+    CollisionIterator& end()   { return this->_collisionList.end(); }
 
 

branches/coll_rect/src/lib/collision_reaction/cr_engine.h

@@ -23 +23 @@
   class Collision;
   class CollisionEvent;
+  class CollisionReaction;
+
 
   //! A default singleton class.

branches/coll_rect/src/world_entities/world_entity.h

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