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

Timestamp:

Apr 10, 2009, 12:05:01 AM (15 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/WeaponSet.h (modified) (3 diffs)

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

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
-#include <vector>
+#include <map>
 
 #include "core/BaseObject.h"
@@ -42 +42 @@
     {
         public:
-            WeaponSet(BaseObject* creator, int k = 0);
+            WeaponSet(BaseObject* creator);
             virtual ~WeaponSet();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void attachWeaponPack(WeaponPack *wPack);
+//            void attachWeaponPack(WeaponPack *wPack);
+
             void fire();
 
-            inline void setFireMode(const unsigned int firemode)
-                { this->firemode_ = firemode; }
-            inline unsigned int getFireMode() const
-                { return this->firemode_; }
+            void setWeaponmodeLink(WeaponPack* weaponpack, unsigned int weaponmode);
+            void removeWeaponmodeLink(WeaponPack* weaponpack);
+            unsigned int getWeaponmodeLink(WeaponPack* weaponpack);
+
+            inline void setDesiredFiremode(const unsigned int firemode)
+                { this->desiredFiremode_ = firemode; }
+            inline unsigned int getDesiredFiremode() const
+                { return this->desiredFiremode_; }
 
             inline void setWeaponSystem(WeaponSystem *weaponSystem)
@@ -62 +67 @@
         private:
             WeaponSystem *weaponSystem_;
-            std::vector<WeaponSlot *> setWeaponSlots_;
-            unsigned int firemode_;
-            WeaponPack * attachedWeaponPack_;
+            unsigned int desiredFiremode_;
+            std::map<WeaponPack*, unsigned int> weaponpacks_;
     };
 }