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

trunk/src/lib/collision_reaction/cr_engine.cc

@@ -29 +29 @@
 
 
-
+ObjectListDefinition(CREngine);
 /**
  * standard constructor
@@ -36 +36 @@
   : BaseObject()
 {
-   this->setClassID(CL_CR_ENGINE, "CREngine");
+  this->registerObject(this, CREngine::_objectList);
    this->setName("CREngine");