Changeset 9235 in orxonox.OLD for trunk/src/defs

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

File:

• trunk/src/defs/class_id.h (modified) (5 diffs)

trunk/src/defs/class_id.h

@@ -191 +191 @@
   CL_CRANE                      =    0x00000316,
   CL_BRAKING_WALL               =    0X00000317,
+  CL_AIMING_SYSTEM              =    0x00000318,
+  CL_GATE                       =    0x00000319,
 
   // Playables
@@ -213 +215 @@
   // Weapons
   CL_TEST_GUN                   =    0x000003a0,
-  CL_TURRET                     =    0x000003a1,
-  CL_AIMING_TURRET              =    0x000003a2,
-  CL_CANNON                     =    0x000003a3,
-  CL_TARGETING_TURRET           =    0x000003a4,
-  CL_HYPERBLASTER               =    0x000003a5,
-  CL_FPS_SNIPER_RIFLE           =    0x000003a6,
-  CL_FPS_LASER_RIFLE            =    0x000003a7,
+  CL_LASER_CANNON               =    0x000003a1,
+  CL_TURRET                     =    0x000003a2,
+  CL_AIMING_TURRET              =    0x000003a3,
+  CL_CANNON                     =    0x000003a4,
+  CL_TARGETING_TURRET           =    0x000003a5,
+  CL_HYPERBLASTER               =    0x000003a6,
+  CL_FPS_SNIPER_RIFLE           =    0x000003a7,
+  CL_FPS_LASER_RIFLE            =    0x000003a8,
+  CL_BOOMERANG_GUN              =    0x00000309,
 
   // Projectiles
@@ -225 +229 @@
   CL_ROCKET                     =    0x000003e1,
   CL_LASER                      =    0x000003e2,
-  CL_BOMB                       =    0x000003e3,
-  CL_GROUND_TURRET              =    0x000003e4,
-  CL_GUIDED_MISSILE             =    0x000003e5,
-  CL_HYPERBLAST                 =    0x000003e6,
+  CL_RAIL_PROJECTILE            =    0x000003e3,
+  CL_BOMB                       =    0x000003e4,
+  CL_GROUND_TURRET              =    0x000003e5,
+  CL_SPACE_TURRET               =    0x000003e6,
+  CL_GUIDED_MISSILE             =    0x000003e7,
+  CL_HYPERBLAST                 =    0x000003e8,
+  CL_BOOMERANG_PROJECTILE       =    0x00000309,
 
   // NPC's
@@ -234 +241 @@
   CL_NPC_TEST2                  =    0x00000402,
   CL_GENERIC_NPC                =    0x00000403,
+  CL_ATTRACTOR_MINE             =    0x00000404,
 
   // Testing Entities
@@ -276 +284 @@
   CL_COLLISION_REACTION         =    0X00000713,
   CL_CR_PHYSICS_MOMENTUM        =    0X00000714,
-  CL_CR_PHYSICS_GROUND          =    0X00000715,
-  CL_CR_PHYSICS_GROUND_WALK     =    0X00000716,
+  CL_CR_PHYSICS_GROUND_WALK     =    0X00000715,
+  CL_CR_PHYSICS_FULL_WALK       =    0X00000716,
   CL_CR_OBJECT_DAMAGE           =    0X00000717,
   CL_CR_OBJECT_PICKUP           =    0X00000718,