Changeset 6669 in orxonox.OLD for trunk/src/world_entities/weapons/weapon_manager.h

Timestamp:

Jan 24, 2006, 2:26:15 PM (18 years ago)

Author:

bensch

Message:

some WeaponManager remake

File:

• trunk/src/world_entities/weapons/weapon_manager.h (modified) (5 diffs)

trunk/src/world_entities/weapons/weapon_manager.h

@@ -17 +17 @@
 #include "crosshair.h"
 #include "weapon.h"
+
+#include "count_pointer.h"
+#include "ammo_container.h"
 
 // FORWARD DECLARATION
@@ -72 +75 @@
 
     bool addWeapon(Weapon* weapon);
-    bool addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
+    bool addWeapon(Weapon* weapon, int configID, int slotID = -1);
     void removeWeapon(Weapon* weapon, int configID = -1);
+
     Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID].nextWeapon: NULL; };
 
@@ -82 +86 @@
     void previousWeaponConfig();
     void changeWeaponConfig(int weaponConfig);
+
+    float addAmmunition(ClassID projectileType, float ammo);
+
 
     /** @returns a fixed target namely the Crosshair's 3D position */
@@ -97 +104 @@
  // private:
     int getNextFreeSlot(int configID, long capability = WTYPE_ALL);
+    CountPointer<AmmoContainer>& getAmmoContainer(ClassID projectileType);
 
   private:
@@ -112 +120 @@
     Crosshair*              crosshair;                                //!< an aim.
     tAnimation<Crosshair>*  crossHairSizeAnim;                        //!< An animation for the crosshair (scaling)
+
+    std::vector<CountPointer<AmmoContainer> > ammo;                   //!< Containers
 };