Changeset 6588 in orxonox.OLD for branches/powerups/src/world_entities/playable.cc

Timestamp:

Jan 18, 2006, 4:41:00 PM (18 years ago)

Author:

manuel

Message:

prepare to merge…

File:

• branches/powerups/src/world_entities/playable.cc (modified) (1 diff)

branches/powerups/src/world_entities/playable.cc

@@ -149 +149 @@
     Weapon* weapon = dynamic_cast<WeaponPowerUp*>(powerUp)->getWeapon();
     WeaponManager* manager = this->getWeaponManager();
-    int slot = manager->getNextFreeSlot(2, weapon->getCapability());
-    if(slot >= 0) {
-      manager->addWeapon(weapon, 2, slot);
-      return true;
-    }
+    manager->addWeapon(weapon, 2, -1);
+    return true;
   }
   else if(powerUp->isA(CL_PARAM_POWER_UP)) {