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

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/WeaponSet.cc (modified) (5 diffs)

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

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
 
-#include "Weapon.h"
-#include "WeaponSlot.h"
+#include "WeaponSystem.h"
 #include "WeaponPack.h"
-#include "WeaponSystem.h"
 
 namespace orxonox
@@ -42 +39 @@
     CreateFactory(WeaponSet);
 
-    WeaponSet::WeaponSet(BaseObject* creator, int k) : BaseObject(creator)
+    WeaponSet::WeaponSet(BaseObject* creator) : BaseObject(creator)
     {
         RegisterObject(WeaponSet);
 
         this->weaponSystem_ = 0;
-        this->attachedWeaponPack_ = 0;
+        this->desiredFiremode_ = WeaponSystem::FIRE_MODE_UNASSIGNED;
 
 COUT(0) << "+WeaponSet" << std::endl;
@@ -55 +52 @@
     {
 COUT(0) << "~WeaponSet" << std::endl;
+
+        if (this->isInitialized() && this->weaponSystem_)
+            this->weaponSystem_->removeWeaponSet(this);
     }
 
@@ -61 +61 @@
         SUPER(WeaponSet, XMLPort, xmlelement, mode);
 
-        XMLPortParam(WeaponSet, "firemode", setFireMode, getFireMode, xmlelement, mode);
+        XMLPortParam(WeaponSet, "firemode", setDesiredFiremode, getDesiredFiremode, xmlelement, mode);
     }
-
+/*
     void WeaponSet::attachWeaponPack(WeaponPack *wPack)
     {
@@ -100 +100 @@
         }
     }
-
+*/
 
     void WeaponSet::fire()
     {
-        //fires all WeaponSlots available for this weaponSet attached from the WeaponPack
-        if (this->attachedWeaponPack_)
-            this->attachedWeaponPack_->fire();
+        // fire all WeaponPacks with their defined weaponmode
+        for (std::map<WeaponPack*, unsigned int>::iterator it = this->weaponpacks_.begin(); it != this->weaponpacks_.end(); ++it)
+            if (it->second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
+                it->first->fire(it->second);
+    }
+
+    void WeaponSet::setWeaponmodeLink(WeaponPack* weaponpack, unsigned int weaponmode)
+    {
+        this->weaponpacks_[weaponpack] = weaponmode;
+    }
+
+    void WeaponSet::removeWeaponmodeLink(WeaponPack* weaponpack)
+    {
+        this->weaponpacks_.erase(weaponpack);
+    }
+
+    unsigned int WeaponSet::getWeaponmodeLink(WeaponPack* weaponpack)
+    {
+        std::map<WeaponPack*, unsigned int>::iterator it = this->weaponpacks_.find(weaponpack);
+        if (it != this->weaponpacks_.end())
+            return it->second;
+        else
+            return WeaponSystem::WEAPON_MODE_UNASSIGNED;
     }
 }