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

Timestamp:

Nov 24, 2005, 12:13:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

• trunk/src/defs/class_id.h (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -135 +135 @@
   CL_TEST_GUN                   =    0x00000230,
   CL_TURRET                     =    0x00000231,
-
+  CL_AIMING_TURRET              =    0x00000232,
+  CL_CANNON                     =    0x00000233,
 
   CL_TEST_BULLET                =    0x00000240,
   CL_ROCKET                     =    0x00000241,
   CL_LASER                      =    0x00000242,
-
+  CL_BOMB                       =    0x00000243,
+  CL_GROUND_TURRET              =    0x00000244,
 
   // gamePlay (range from 0x00000500 0x000005ff)