Changeset 6412 for code/branches/pickup2/src/orxonox/weaponsystem/WeaponSystem.h

Timestamp:

Dec 25, 2009, 1:18:03 PM (16 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/orxonox/weaponsystem/WeaponSystem.h (modified) (1 diff)

code/branches/pickup2/src/orxonox/weaponsystem/WeaponSystem.h

@@ -92 +92 @@
             std::map<unsigned int, WeaponSet *> weaponSets_;
             std::vector<WeaponSlot *> weaponSlots_;
-            std::set<WeaponPack *> weaponPacks_;
+            std::vector<WeaponPack *> weaponPacks_;
             std::map<Identifier *, Munition *> munitions_;
             Pawn * pawn_;