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

Timestamp:

Jul 21, 2005, 4:59:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the activation and deactivation-phase of the Weapon work too.

File:

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

orxonox/trunk/src/world_entities/weapons/weapon_manager.h

@@ -76 +76 @@
 class WeaponManager : public BaseObject {
   public:
-    WeaponManager(int nrOfSlots = 2);
+    WeaponManager(int slotCount);
     WeaponManager(const TiXmlElement* root);
     ~WeaponManager();
@@ -84 +84 @@
     void loadWeapons(const TiXmlElement* root);
 
-    void setSlotCount(int nrOfSlots);
+    void setSlotCount(int slotCount);
 
     void addWeapon(Weapon* weapon, int configID = WM_CONFIG0, int slotID = WM_FREE_SLOT);
@@ -101 +101 @@
     tAnimation<Crosshair>*  crossHairSizeAnim;
 
-    int                     nrOfSlots;               //<! number of weapon slots a ship has
+    int                     slotCount;               //<! number of weapon slots a ship has
     int                     currConfID;              //<! the currently selected config
     weaponConfig            configs[4];              //<! a list of four configurations