Changeset 2914 for code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h

Timestamp:

Apr 10, 2009, 12:05:01 AM (16 years ago)

Author:

landauf

Message:

More changes in the WeaponSystem:

• WeaponSets can now contain several WeaponPacks
• WeaponPacks can now belong to several WeaponSets

(until now this seemingly was a 1:1 relationship… now it's n:m)

• Started support for multiple weaponmodes
• Added some code to the destructor of some classes… according to some legends, this helps destroying objects. (WeaponSets and WeaponPacks weren't deleted before…)

Not yet finished, but I have to synchronize desktop computer and notebook.

File:

• code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h (modified) (3 diffs)

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

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
-#include <vector>
+#include <set>
 
 #include "core/BaseObject.h"
@@ -47 +47 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void fire();
-
-            Weapon * getWeaponPointer(unsigned int n) const;
-            int getSize() const;
-
-            void setFireMode(unsigned int firemode);
-            unsigned int getFireMode() const;
+            void fire(unsigned int weaponmode);
 
             void addWeapon(Weapon * weapon);
-            const Weapon * getWeapon(unsigned int index) const;
+            Weapon * getWeapon(unsigned int index) const;
+
+            inline size_t getNumWeapons() const
+                { return this->weapons_.size(); }
+
+            unsigned int getDesiredWeaponmode(unsigned int firemode) { return 0; } // TODO
 
             void attachNeededMunitionToAllWeapons();
 
-            //functions with effect to all weapons of the weaponPack
-            //functions needed for creating Pointer to the right objects (-->Pawn.cc)
             inline void setWeaponSystem(WeaponSystem *weaponSystem)
                 { this->weaponSystem_ = weaponSystem; this->setWeaponSystemToAllWeapons(weaponSystem); }
@@ -70 +67 @@
             void setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem);
 
-            std::vector<Weapon *> weapons_;
-            WeaponSystem *weaponSystem_;
-            unsigned int firemode_;
+            std::set<Weapon *> weapons_;
+            WeaponSystem * weaponSystem_;
     };
 }