Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7078 in orxonox.OLD for trunk/src/world_entities


Ignore:
Timestamp:
Feb 7, 2006, 4:13:01 PM (19 years ago)
Author:
patrick
Message:

trunk: player group handling

Location:
trunk/src/world_entities
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/creatures/md2_creature.cc

    r7071 r7078  
    6464
    6565  this->loadParams(doc.RootElement());
    66   this->toList(OM_GROUP_03);
     66  this->toList(OM_GROUP_01);
    6767}
    6868
  • trunk/src/world_entities/playable.cc

    r7072 r7078  
    163163  if (State::isOnline())
    164164  {
    165   if( this == State::getPlayer()->getPlayable())
    166     State::getGameRules()->onPlayerDeath();
    167 
    168   this->toList(OM_DEAD);
    169   //.HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
    170   this->setAbsCoor(-2000.0, -2000.0, -2000.0);
     165    if( this == State::getPlayer()->getPlayable())
     166      State::getGameRules()->onPlayerDeath();
     167
     168
     169    this->toList(OM_DEAD);
     170  //HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
     171    this->setAbsCoor(-2000.0, -2000.0, -2000.0);
    171172
    172173  //explosion hack
    173   this->emitter->setSystem(explosionParticles);
    174   this->setAbsCoor(0, 0, 0);
    175   this->emitter->setSystem(NULL);
     174    this->emitter->setSystem(explosionParticles);
     175    this->setAbsCoor(0, 0, 0);
     176    this->emitter->setSystem(NULL);
    176177  }
    177178}
  • trunk/src/world_entities/test_entity.cc

    r7071 r7078  
    5858{
    5959  this->setClassID(CL_TEST_ENTITY, "TestEntity");
    60   this->toList(OM_COMMON);
     60  this->toList(OM_GROUP_00);
    6161}
    6262
Note: See TracChangeset for help on using the changeset viewer.