Changeset 6710 in orxonox.OLD for trunk/src/world_entities/playable.cc

Timestamp:

Jan 25, 2006, 4:18:12 PM (20 years ago)

Author:

bensch

Message:

merged the powerups back to the trunk

File:

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

trunk/src/world_entities/playable.cc

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