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

Timestamp:

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

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (1 diff)
• boomerang_gun.cc (modified) (1 diff)
• cannon.cc (modified) (1 diff)
• fps_sniper_rifle.cc (modified) (1 diff)
• hyperblaster.cc (modified) (1 diff)
• laser_cannon.cc (modified) (1 diff)
• targeting_turret.cc (modified) (1 diff)
• test_gun.cc (modified) (1 diff)
• turret.cc (modified) (1 diff)

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -27 +27 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
+
+ObjectListDefinition(AimingTurret);
 CREATE_FACTORY(AimingTurret);
 

trunk/src/world_entities/weapons/boomerang_gun.cc

@@ -27 +27 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
+
+ObjectListDefinition(BoomerangGun);
 CREATE_FACTORY(BoomerangGun);
 

trunk/src/world_entities/weapons/cannon.cc

@@ -36 +36 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Cannon, CL_CANNON);
+
+ObjectListDefinition(Cannon);
 CREATE_FACTORY(Cannon);
 

trunk/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -39 +39 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
+
+ObjectListDefinition(FPSSniperRifle);
 CREATE_FACTORY(FPSSniperRifle);
 

trunk/src/world_entities/weapons/hyperblaster.cc

@@ -35 +35 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
+
+ObjectListDefinition(Hyperblaster);
 CREATE_FACTORY(Hyperblaster);
 

trunk/src/world_entities/weapons/laser_cannon.cc

@@ -31 +31 @@
 #include "loading/fast_factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
+
+ObjectListDefinition(LaserCannon);
 CREATE_FACTORY(LaserCannon);
 

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -26 +26 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
+
+ObjectListDefinition(TargetingTurret);
 CREATE_FACTORY(TargetingTurret);
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -33 +33 @@
 #include "loading/fast_factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TestGun, CL_TEST_GUN);
+
+ObjectListDefinition(TestGun);
 CREATE_FACTORY(TestGun);
 /**

trunk/src/world_entities/weapons/turret.cc

@@ -27 +27 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Turret, CL_TURRET);
+
+ObjectListDefinition(Turret);
 CREATE_FACTORY(Turret);