Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10686 in orxonox.OLD


Ignore:
Timestamp:
Jun 12, 2007, 3:46:19 PM (17 years ago)
Author:
nicolasc
Message:

xfer

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

    r10684 r10686  
    462462      {
    463463        int slot = ws->getWeaponSlot();
    464         int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used// HACK needed for some weapons (left/right)
     464//        int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used// HACK needed for some weapons (left/right)
    465465        this->getWeaponManager().setSlotPosition(slot, (*it).second->getCenter());
    466466        this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());
     
    684684  else
    685685  {*/
    686     this->setAbsCoor( this->getAbsCoor() + Vector(100,0,0) + Vector(1,0,0) * VECTOR_RAND(150).dot(Vector(1,0,0)));
     686  //!< ancient test hack
     687//     this->setAbsCoor( this->getAbsCoor() + Vector(100,0,0) + Vector(1,0,0) * VECTOR_RAND(150).dot(Vector(1,0,0)));
    687688  //}
    688689
     
    718719  for( unsigned int i=0; i < this->weaponMan.getSlotCount(); i++) {
    719720    weapon = this->weaponMan.getWeapon(i);
    720     if( weapon != NULL && weapon->isActive()) {
     721    if( weapon != NULL) {
     722      if (weapon->isActive() )
    721723      weaponCount++;
    722724    }
     
    729731  for( unsigned int i=0; i < this->weaponMan.getSlotCount(); i++) {
    730732    weapon = this->weaponMan.getWeapon(i);
    731     if( weapon != NULL && weapon->isActive()) {
    732       weapon->increaseEnergy( energy);
     733    if( weapon != NULL) {
     734      if (weapon->isActive() )
     735        weapon->increaseEnergy( energy);
    733736    }
    734737  }
Note: See TracChangeset for help on using the changeset viewer.