Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9222 in orxonox.OLD


Ignore:
Timestamp:
Jul 5, 2006, 1:24:38 PM (18 years ago)
Author:
patrick
Message:

hyper gate and singleplayer walk

Location:
branches/presentation/src
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • branches/presentation/src/defs/class_id.h

    r9217 r9222  
    192192  CL_BRAKING_WALL               =    0X00000317,
    193193  CL_AIMING_SYSTEM              =    0x00000318,
     194  CL_GATE                       =    0x00000319,
    194195
    195196  // Playables

  • branches/presentation/src/lib/graphics/importer/md2/md2Model.h

    r9142 r9222  
    3030#define MD2_VERSION                     8                                        //!< the md2 version in the header
    3131#define MD2_MAX_TRIANGLES               4096                                     //!< maximal triangles count
    32 #define MD2_MAX_VERTICES                2048                                     //!< maximal vertices count
    33 #define MD2_MAX_TEXCOORDS               2048                                     //!< maximal tex coordinates
     32#define MD2_MAX_VERTICES                3048                                     //!< maximal vertices count
     33#define MD2_MAX_TEXCOORDS               3048                                     //!< maximal tex coordinates
    3434#define MD2_MAX_FRAMES                  512                                      //!< maximal frames
    3535#define MD2_MAX_SKINS                   32                                       //!< maximal skins

  • branches/presentation/src/world_entities/WorldEntities.am

    r9217 r9222  
    77                world_entities/npcs/generic_npc.cc \
    88                world_entities/npcs/door.cc \
     9                world_entities/npcs/gate.cc \
    910                world_entities/npcs/repair_station.cc \
    1011                world_entities/npcs/attractor_mine.cc \

  • branches/presentation/src/world_entities/creatures/fps_player.cc

    r9221 r9222  
    170170  this->damageTicker = 0.0f;
    171171
    172   toList( OM_PLAYERS );
     172//   toList( OM_PLAYERS );
    173173}
    174174
    … …  
    289289
    290290  //dealing damage
    291  
     291
    292292  if ( State::isOnline() && SharedNetworkData::getInstance()->isGameServer() )
    293293  {
    294294    this->damageTicker -= time;
    295  
     295
    296296    if ( this->damageTicker <= 0.0f && this->beFire() )
    297297    {
    298298      this->damageTicker = 0.25;
    299    
     299
    300300      WorldEntity * victim = aimingSystem->getNearestTarget();
    301    
     301
    302302      if ( victim )
    303303      {
    … …  
    486486  if( State::isOnline())
    487487    toList( OM_PLAYERS );
    488  
     488
    489489  this->damageTicker = 0.0f;
    490  
     490
    491491  Playable::respawn();
    492492}
Note: See TracChangeset for help on using the changeset viewer.