Changeset 2915 for code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.h

Timestamp:

Apr 12, 2009, 12:34:55 AM (15 years ago)

Author:

landauf

Message:

• switched back to std::vector for the WeaponSlots to keep them in the same order as in the XML file
• added DefaultWeaponmodeLink, a class which links weaponmodes (a property of a Weapon or a WeaponPack) with firemodes (one firemode corresponds to one WeaponSet). This can be changed later (for example in a nice GUI), but DefaultWeaponmodeLink defines the default value.

File:

• code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (2 diffs)

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

@@ -35 +35 @@
 #include <set>
 #include <map>
+#include <vector>
 
 #include "core/BaseObject.h"
@@ -93 +94 @@
         private:
             std::map<unsigned int, WeaponSet *> weaponSets_;
-            std::set<WeaponSlot *> weaponSlots_;
+            std::vector<WeaponSlot *> weaponSlots_;
             std::set<WeaponPack *> weaponPacks_;
             std::map<std::string, Munition *> munitionSet_;