Changeset 6972 in orxonox.OLD for trunk/src

Timestamp:

Feb 2, 2006, 10:18:54 AM (19 years ago)

Author:

bensch

Message:

trunk: better functionality in the ammo-container functionality

Location:

trunk/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (2 diffs)
• weapon_manager.h (modified) (2 diffs)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -297 +297 @@
 }
 
+/**
+ * @brief does the same as the funtion inclreaseAmmunition, added four your convenience
+ * @param weapon, the Weapon to read the ammo-info about.
+ * @param ammo how much ammo to add.
+ */
+float WeaponManager::inclreaseAmmunition(const Weapon* weapon, float ammo)
+{
+  assert (weapon != NULL);
+  return this->increaseAmmunition(weapon->getLeafClassID(), ammo);
+
+}
 
 
@@ -503 +514 @@
 }
 
+CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(const Weapon* weapon)
+{
+  assert (weapon != NULL);
+  return (this->getAmmoContainer(weapon->getLeafClassID()));
+}
+
 
 /**

trunk/src/world_entities/weapons/weapon_manager.h

@@ -87 +87 @@
 
     float increaseAmmunition(ClassID projectileType, float ammo);
-
+    float inclreaseAmmunition(const Weapon* weapon, float ammo);
 
     /** @returns a fixed target namely the Crosshair's 3D position */
@@ -104 +104 @@
     int getNextFreeSlot(int configID, long capability = WTYPE_ALL);
     CountPointer<AmmoContainer>& getAmmoContainer(ClassID projectileType);
+    CountPointer<AmmoContainer>& getAmmoContainer(const Weapon* weapon);
 
   private: