Changeset 6677 in orxonox.OLD for trunk/src

Timestamp:

Jan 24, 2006, 8:37:08 PM (19 years ago)

Author:

bensch

Message:

trunk: minor

File:

• trunk/src/world_entities/weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -207 +207 @@
 {
   int weaponConf = this->currentConfigID;
-  int slot;
-  if (slot = this->getNextFreeSlot(weaponConf, weapon->getCapability()) != -1 )
-    this->addWeapon(weapon, weaponConf, slot);
+  int slot = this->getNextFreeSlot(weaponConf, weapon->getCapability());
+  if (slot  != -1 )
+  {
+    return this->addWeapon(weapon, weaponConf, slot);
+  }
   else
-    this->addWeapon(weapon, -1, -1);
+  {
+    return this->addWeapon(weapon, -1, -1);
+  }
 }