Changeset 6931 in orxonox.OLD for trunk

Timestamp:

Feb 1, 2006, 1:26:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented addWeapon

Location:

trunk/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (1 diff)
• weapon_manager.h (modified) (1 diff)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -286 +286 @@
   return true;
 }
+
+/**
+ * @brief increases the Energy of the WeaponContainer of type (projectileType)
+ * @param projectileType the type of weapon to increase Energy from
+ * @param ammo the ammo to increase
+ */
+float WeaponManager::increaseAmmunition(ClassID projectileType, float ammo)
+{
+  return this->getAmmoContainer(projectileType)->increaseEnergy(ammo);
+}
+
+
 
 /**

trunk/src/world_entities/weapons/weapon_manager.h

@@ -86 +86 @@
     void changeWeaponConfig(int weaponConfig);
 
-    float addAmmunition(ClassID projectileType, float ammo);
+    float increaseAmmunition(ClassID projectileType, float ammo);