Changeset 9869 in orxonox.OLD for trunk/src/world_entities/space_ships/collision_probe.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/space_ships/collision_probe.cc (modified) (2 diffs)

trunk/src/world_entities/space_ships/collision_probe.cc

@@ -24 +24 @@
 
 
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
 
-
-CREATE_FACTORY(CollisionProbe, CL_COLLISION_PROBE);
+CREATE_FACTORY(CollisionProbe);
 
 
@@ -56 +57 @@
 void CollisionProbe::init()
 {
-  this->setClassID(CL_COLLISION_PROBE, "CollisionProbe");
+  this->registerObject(this, CollisionProbe::_objectList);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;