Changeset 9709 in orxonox.OLD for branches/new_class_id/src/world_entities/environments/water.cc

Timestamp:

Aug 31, 2006, 10:51:08 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: new_class ID working, adapdet many classes, and reinvented some of the ClassID stuff

File:

• branches/new_class_id/src/world_entities/environments/water.cc (modified) (2 diffs)

branches/new_class_id/src/world_entities/environments/water.cc

@@ -33 +33 @@
 
 
-
-CREATE_FACTORY(Water, CL_WATER);
+#include "class_id.h"
+NewObjectListDefinitionID(Water, CL_WATER);
+CREATE_FACTORY(Water);
 
 
 Water::Water(const TiXmlElement* root)
 {
-  this->setClassID(CL_WATER, "Water");
+  this->registerObject(this, Water::_objectList);
   this->toList(OM_ENVIRON);
 
@@ -217 +218 @@
 void Water::tick(float dt)
 {
-  ObjectManager::EntityList entityList = State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ);
+  ObjectManager::EntityList entityList = State::getObjectManager()->getEntityList(OM_GROUP_01_PROJ);
   ObjectManager::EntityList::iterator entity = entityList.begin();
   while (entity != entityList.end())