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

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 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/environment.cc (modified) (2 diffs)

trunk/src/world_entities/environment.cc

@@ -20 +20 @@
 #include "environment.h"
 
-#include "util/loading/resource_manager.h"
-
-#include "vector.h"
 #include "objModel.h"
 #include "obb_tree.h"
 #include "util/loading/factory.h"
 
-
-CREATE_FACTORY(Environment, CL_ENVIRONMENT);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Environment, CL_ENVIRONMENT);
+CREATE_FACTORY(Environment);
 
 /**
@@ -63 +61 @@
 void Environment::init()
 {
-  this->setClassID(CL_ENVIRONMENT, "Environment");
+  this->registerObject(this, Environment::_objectList);
   this->toList(OM_ENVIRON);
 }