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

Timestamp:

Oct 13, 2006, 3:57:44 PM (18 years ago)

Author:

patrick

Message:

added namspacing to collision reaction. now comes the harder part

File:

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

branches/coll_rect/src/world_entities/world_entity.h

@@ -82 +82 @@
 
   /* --- Collision Reaction Block --- */
-  void subscribeReaction(CREngine::CRType type);
-  void subscribeReaction(CREngine::CRType type, const ClassID& target1);
-  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2);
-  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3);
-  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3, const ClassID& target4);
-
-  void unsubscribeReaction(CREngine::CRType type);
+  void subscribeReaction(CoRe::CREngine::CRType type);
+  void subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1);
+  void subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1, const ClassID& target2);
+  void subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3);
+
+  void unsubscribeReaction(CoRe::CREngine::CRType type);
   void unsubscribeReaction();
 
@@ -96 +95 @@
   inline bool isReactive() const { return this->bReactive; }
 
-  CollisionHandle* getCollisionHandle(CREngine::CRType type) const { return this->collisionHandles[type]; }
+  CoRe::CollisionHandle* getCollisionHandle(CoRe::CREngine::CRType type) const { return this->collisionHandles[type]; }
 
   /** @returns true if this entity is standing on ground (BSP model) */
@@ -212 +211 @@
   int                     healthMax_handle;
 
-  CollisionHandle*        collisionHandles[CREngine::CR_NUMBER];  //!< the list of the collision reactions
+  CoRe::CollisionHandle*  collisionHandles[CoRe::CREngine::CR_NUMBER];  //!< the list of the collision reactions
   bool                    bReactive;                              //!< true if there is at least one collision reaction subscibed
+
 
   PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity