Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6677 in orxonox.OLD for trunk/src/world_entities/weapons


Ignore:
Timestamp:
Jan 24, 2006, 8:37:08 PM (19 years ago)
Author:
bensch
Message:

trunk: minor

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/weapons/weapon_manager.cc

    r6676 r6677  
    207207{
    208208  int weaponConf = this->currentConfigID;
    209   int slot;
    210   if (slot = this->getNextFreeSlot(weaponConf, weapon->getCapability()) != -1 )
    211     this->addWeapon(weapon, weaponConf, slot);
     209  int slot = this->getNextFreeSlot(weaponConf, weapon->getCapability());
     210  if (slot  != -1 )
     211  {
     212    return this->addWeapon(weapon, weaponConf, slot);
     213  }
    212214  else
    213     this->addWeapon(weapon, -1, -1);
     215  {
     216    return this->addWeapon(weapon, -1, -1);
     217  }
    214218}
    215219
Note: See TracChangeset for help on using the changeset viewer.