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

Timestamp:

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

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/world_entities/npcs

Files:

• attractor_mine.cc (modified) (1 diff)
• door.cc (modified) (1 diff)
• gate.cc (modified) (1 diff)
• generic_npc.cc (modified) (1 diff)
• ground_turret.cc (modified) (1 diff)
• network_turret.cc (modified) (1 diff)
• npc_test.cc (modified) (1 diff)
• repair_station.cc (modified) (1 diff)
• space_turret.cc (modified) (1 diff)

trunk/src/world_entities/npcs/attractor_mine.cc

@@ -33 +33 @@
 #include "effects/explosion.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
+
+ObjectListDefinition(AttractorMine);
 CREATE_FACTORY(AttractorMine);
 #include "script_class.h"

trunk/src/world_entities/npcs/door.cc

@@ -26 +26 @@
 #include "door.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Door, CL_DOOR);
+
+ObjectListDefinition(Door);
 CREATE_FACTORY(Door);
 

trunk/src/world_entities/npcs/gate.cc

@@ -31 +31 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Gate, CL_GATE);
+
+ObjectListDefinition(Gate);
 CREATE_FACTORY(Gate);
 

trunk/src/world_entities/npcs/generic_npc.cc

@@ -33 +33 @@
 #include "bsp_entity.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
+
+ObjectListDefinition(GenericNPC);
 CREATE_FACTORY(GenericNPC);
 

trunk/src/world_entities/npcs/ground_turret.cc

@@ -29 +29 @@
 #include "effects/explosion.h"
 
-#include "class_id_DEPRECATED.h"
 
-ObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
+
+ObjectListDefinition(GroundTurret);
 CREATE_FACTORY(GroundTurret);
 

trunk/src/world_entities/npcs/network_turret.cc

@@ -32 +32 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
+
+ObjectListDefinition(NetworkTurret);
 CREATE_FACTORY(NetworkTurret);
 

trunk/src/world_entities/npcs/npc_test.cc

@@ -30 +30 @@
 #include "effects/explosion.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
+
+ObjectListDefinition(NPC2);
 CREATE_FACTORY(NPC2);
 

trunk/src/world_entities/npcs/repair_station.cc

@@ -26 +26 @@
 #include "repair_station.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(RepairStation, CL_DOOR +1 );
+
+ObjectListDefinition(RepairStation);
 CREATE_FACTORY(RepairStation);
 

trunk/src/world_entities/npcs/space_turret.cc

@@ -29 +29 @@
 #include "effects/explosion.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
+
+ObjectListDefinition(SpaceTurret);
 CREATE_FACTORY(SpaceTurret);