Changeset 10114 in orxonox.OLD for trunk/src/world_entities/environments

Timestamp:

Dec 19, 2006, 11:55:26 PM (18 years ago)

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/world_entities/environments

Files:

• building.cc (modified) (1 diff)
• mapped_water.cc (modified) (1 diff)
• model_entity.cc (modified) (1 diff)
• water.cc (modified) (1 diff)

trunk/src/world_entities/environments/building.cc

@@ -23 +23 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Building, CL_BUILDING);
+
+ObjectListDefinition(Building);
 CREATE_FACTORY(Building);
 

trunk/src/world_entities/environments/mapped_water.cc

@@ -26 +26 @@
 #include "resource_shader.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
+
+ObjectListDefinition(MappedWater);
 CREATE_FACTORY(MappedWater);
 

trunk/src/world_entities/environments/model_entity.cc

@@ -23 +23 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
+
+ObjectListDefinition(ModelEntity);
 CREATE_FACTORY(ModelEntity);
 

trunk/src/world_entities/environments/water.cc

@@ -32 +32 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Water, CL_WATER);
+
+ObjectListDefinition(Water);
 CREATE_FACTORY(Water);