Changeset 7946 in orxonox.OLD for branches/cr/src/world_entities

Timestamp:

May 29, 2006, 1:04:39 AM (18 years ago)

Author:

patrick

Message:

cr: more cr cleanup

Location:

branches/cr/src/world_entities

Files:

• world_entity.cc (modified) (2 diffs)
• world_entity.h (modified) (1 diff)

branches/cr/src/world_entities/world_entity.cc

@@ -94 +94 @@
   if (this->healthWidget != NULL)
     delete this->healthWidget;
+
+  this->unsubscribeReaction();
 }
 
@@ -263 +265 @@
 
 /**
+ * unsubscribes a specific reaction from the worldentity
+ *  @param type the reaction to unsubscribe
+ */
+void WorldEntity::unsubscribeReaction(CREngine::CRType type)
+{
+  if( this->collisionHandles[type] == NULL)
+    return;
+
+  CREngine::getInstance()->unsubscribeReaction(this->collisionHandles[type]);
+  this->collisionHandles[type] = NULL;
+}
+
+
+/**
+ * unsubscribes all collision reactions
+ */
+void WorldEntity::unsubscribeReaction()
+{
+  for( int i = 0; i < CREngine::CR_NUMBER; i++)
+    this->unsubscribeReaction((CREngine::CRType)i);
+}
+
+
+/**
  * registers a new collision to this world entity
  *  @param collisionEvent the event

branches/cr/src/world_entities/world_entity.h

@@ -71 +71 @@
   /* --- Collision Reaction Block --- */
   void subscribeReaction(CREngine::CRType type, int nrOfTargets, long target, ...);
+  void unsubscribeReaction(CREngine::CRType type);
+  void unsubscribeReaction();
   bool registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);