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

Timestamp:

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

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/world_entities/space_ships

Files:

• collision_probe.cc (modified) (1 diff)
• cruizer.cc (modified) (1 diff)
• helicopter.cc (modified) (1 diff)
• hover.cc (modified) (1 diff)
• space_ship.cc (modified) (1 diff)
• spacecraft_2d.cc (modified) (1 diff)
• turbine_hover.cc (modified) (1 diff)

trunk/src/world_entities/space_ships/collision_probe.cc

@@ -24 +24 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
+
+ObjectListDefinition(CollisionProbe);
 
 CREATE_FACTORY(CollisionProbe);

trunk/src/world_entities/space_ships/cruizer.cc

@@ -34 +34 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Cruizer, CL_CRUIZER);
+
+ObjectListDefinition(Cruizer);
 CREATE_FACTORY(Cruizer);
 

trunk/src/world_entities/space_ships/helicopter.cc

@@ -34 +34 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Helicopter, CL_HELICOPTER);
+
+ObjectListDefinition(Helicopter);
 CREATE_FACTORY(Helicopter);
 #include "script_class.h"

trunk/src/world_entities/space_ships/hover.cc

@@ -34 +34 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Hover, CL_HOVER);
+
+ObjectListDefinition(Hover);
 CREATE_FACTORY(Hover);
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -53 +53 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
+
+ObjectListDefinition(SpaceShip);
 CREATE_FACTORY(SpaceShip);
 

trunk/src/world_entities/space_ships/spacecraft_2d.cc

@@ -38 +38 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
+
+ObjectListDefinition(Spacecraft2D);
 CREATE_FACTORY(Spacecraft2D);
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -34 +34 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
+
+ObjectListDefinition(TurbineHover);
 CREATE_FACTORY(TurbineHover);