Changeset 6139 in orxonox.OLD for trunk/src/defs/class_id.h

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

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

trunk/src/defs/class_id.h

@@ -147 +147 @@
   CL_SPACE_SHIP                 =    0x0000020a,
   CL_HELICOPTER                 =    0x0000020b,
+  CL_SPAWNING_POINT             =    0x0000020b,
 
   CL_TURRET_POWER_UP            =    0x00000211,
@@ -230 +231 @@
 
   // network stuff (range from 0x00000b00 to 0x00000bff)
-  CL_DATA_STREAM                =    0x00b01000,
+  CL_DATA_STREAM                =    0x00b01b00,
   CL_NETWORK_STREAM             =    0x00000b01,
   CL_NETWORK_PROTOCOL           =    0x00000b02,
@@ -236 +237 @@
   CL_SERVER_SOCKET              =    0X00000b04,
   CL_CONNECTION_MONITOR         =    0x00000b05,
+  CL_HANDSHAKE                  =    0x00000b06,
+  CL_ENTITY_MANAGER             =    0x00000b07,