Changeset 9869 in orxonox.OLD for trunk/src/world_entities/weapons/aiming_system.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/weapons/aiming_system.cc (modified) (3 diffs)

trunk/src/world_entities/weapons/aiming_system.cc

@@ -21 +21 @@
 
 #include "state.h"
+#include "debug.h"
 
 #include "aabb.h"
 #include "obb_tree.h"
 
-#include <vector>
 
 
-
-
+ObjectListDefinition(AimingSystem);
 
 /**
@@ -55 +54 @@
 void AimingSystem::init()
 {
-  this->setClassID(CL_AIMING_SYSTEM, "AimingSystem");
+  this->registerObject(this, AimingSystem::_objectList);
   this->setName("AimingSystem");
 
@@ -63 +62 @@
   // registering default reactions:
   this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
-  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
+  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, WorldEntity::staticClassID());
 
   this->range = 1000.0f;