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

trunk/src/world_entities/planet.cc

@@ -30 +30 @@
 #include "primitive_model.h"
 
+#include "debug.h"
 
-
-
-CREATE_FACTORY(Planet, CL_PLANET);
-
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Planet, CL_PLANET);
+CREATE_FACTORY(Planet);
 
 
@@ -42 +42 @@
 Planet::Planet(const TiXmlElement* root)
 {
-  this->setClassID(CL_PLANET, "Planet");
+  this->registerObject(this, Planet::_objectList);
   this->toList(OM_GROUP_01);