Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Aug 4, 2006, 11:01:28 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r9406 r9656  
    234234  CL_GROUND_TURRET              =    0x000003e5,
    235235  CL_SPACE_TURRET               =    0x000003e6,
    236   CL_GUIDED_MISSILE             =    0x000003e7,
    237   CL_HYPERBLAST                 =    0x000003e8,
    238   CL_BOOMERANG_PROJECTILE       =    0x00000309,
     236  CL_NETWORK_TURRET             =    0x000003e7,
     237  CL_GUIDED_MISSILE             =    0x000003e8,
     238  CL_HYPERBLAST                 =    0x000003e9,
     239  CL_BOOMERANG_PROJECTILE       =    0x0000030a,
    239240
    240241  // NPC's
    … …  
    424425  CL_SIMPLE_SYNC                =    0x00000d0a,
    425426  CL_NETWORK_MONITOR            =    0x00000d0b,
     427  CL_PROXY_CONTROL              =    0x00000d0c,
    426428
    427429
Note: See TracChangeset for help on using the changeset viewer.