Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Dec 16, 2005, 6:45:32 PM (19 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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r6113 r6139  
    147147  CL_SPACE_SHIP                 =    0x0000020a,
    148148  CL_HELICOPTER                 =    0x0000020b,
     149  CL_SPAWNING_POINT             =    0x0000020b,
    149150
    150151  CL_TURRET_POWER_UP            =    0x00000211,
    … …  
    230231
    231232  // network stuff (range from 0x00000b00 to 0x00000bff)
    232   CL_DATA_STREAM                =    0x00b01000,
     233  CL_DATA_STREAM                =    0x00b01b00,
    233234  CL_NETWORK_STREAM             =    0x00000b01,
    234235  CL_NETWORK_PROTOCOL           =    0x00000b02,
    … …  
    236237  CL_SERVER_SOCKET              =    0X00000b04,
    237238  CL_CONNECTION_MONITOR         =    0x00000b05,
     239  CL_HANDSHAKE                  =    0x00000b06,
     240  CL_ENTITY_MANAGER             =    0x00000b07,
    238241
    239242
Note: See TracChangeset for help on using the changeset viewer.