Changeset 2914 for code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.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/WeaponSlot.cc (modified) (4 diffs)

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

@@ -34 +34 @@
 
 #include "Weapon.h"
+#include "WeaponSystem.h"
 
 namespace orxonox
@@ -43 +44 @@
         RegisterObject(WeaponSlot);
 
-        this->unlimitedAmmo_ = false;
-        this->attachedWeapon_ = 0;
+        this->weaponSystem_ = 0;
+        this->weapon_ = 0;
+
         this->setObjectMode(0x0);
 
@@ -53 +55 @@
     {
 COUT(0) << "~WeaponSlot" << std::endl;
+
+        if (this->isInitialized() && this->weaponSystem_)
+            this->weaponSystem_->removeWeaponSlot(this);
     }
 
@@ -58 +63 @@
     {
         SUPER(WeaponSlot, XMLPort, xmlelement, mode);
-    }
 
-    /*sets the munition type
-     *unlimited: true
-     *limited:   false  (in this case there will be munition)
-     */
-    void WeaponSlot::setAmmoType(bool isUnlimited)
-    {
-        unlimitedAmmo_ = isUnlimited;
-    }
-
-
-    void WeaponSlot::fire()
-    {
-        if ( this->attachedWeapon_ )
-//COUT(0) << "WeaponSlot::fire" << std::endl;
-        this->attachedWeapon_->fire();
+        // ...
     }
 
     void WeaponSlot::attachWeapon(Weapon *weapon)
     {
-        this->attachedWeapon_ = weapon;
-        weapon->setAttachedToWeaponSlot(this);
-//COUT(0) << "WeaponSlot::attachWeapon position=" << this->getWorldPosition() << std::endl;
-        weapon->setPosition(this->getPosition());
+        if (this->weapon_)
+            this->removeWeapon();
+
+        this->weapon_ = weapon;
+
+        if (this->weapon_)
+        {
+            this->weapon_->setWeaponSlot(this);
+            this->weapon_->setPosition(this->getPosition());
+        }
     }
 
-    Weapon * WeaponSlot::getAttachedWeapon() const
+    void WeaponSlot::removeWeapon()
     {
-        return this->attachedWeapon_;
+        if (this->weapon_)
+        {
+            this->weapon_->setWeaponSlot(0);
+            this->weapon_ = 0;
+        }
     }
 }