Changeset 2778 for code/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.h

Timestamp:

Mar 12, 2009, 5:05:18 PM (15 years ago)

Author:

polakma

Message:

now you can choose between shared munition and normal munition

File:

• code/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (3 diffs)

code/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.h

@@ -53 +53 @@
             //void fire();
             void fire(WeaponMode::Enum fireMode);
-            //void setActiveWeaponSet(unsigned int n);
             void attachWeaponPack(WeaponPack * wPack, unsigned int firemode);
             WeaponSet * getWeaponSetPointer(unsigned int n);
@@ -59 +58 @@
             WeaponPack * getWeaponPackPointer(unsigned int n);
             void setNewMunition(std::string munitionType, Munition * munitionToAdd);
+            void setNewSharedMunition(std::string munitionType, Munition * munitionToAdd);
             Munition * getMunitionType(std::string munitionType);
 
@@ -73 +73 @@
             std::vector<WeaponSlot *> weaponSlots_;
             std::vector<WeaponPack *> weaponPacks_;
+            std::map<std::string, Munition *> munitionSharedSet_;
             std::map<std::string, Munition *> munitionSet_;
             WeaponSet *activeWeaponSet_;