Changeset 10010 in orxonox.OLD for branches/coll_rect.merge/src/world_entities/weapons

Timestamp:

Dec 4, 2006, 4:39:45 PM (18 years ago)

Author:

patrick

Message:

merged the temp branch

File:

• branches/coll_rect.merge/src/world_entities/weapons/aiming_system.cc (modified) (1 diff)

branches/coll_rect.merge/src/world_entities/weapons/aiming_system.cc

@@ -61 +61 @@
 
   // registering default reactions:
-  this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
-  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, WorldEntity::staticClassID());
+  this->unsubscribeReaction(CoRe::CREngine::CR_OBJECT_DAMAGE);
+  this->subscribeReaction(CoRe::CREngine::CR_OBJECT_DAMAGE, WorldEntity::staticClassID());
 
   this->range = 1000.0f;