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

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

@@ -86 +86 @@
                 { return this->weaponSystem_; };
 
-            inline void setAttachedToWeaponSlot(WeaponSlot * wSlot)
-                { this->attachedToWeaponSlot_ = wSlot; }
-            inline WeaponSlot * getAttachedToWeaponSlot() const
-                { return this->attachedToWeaponSlot_; }
+            inline void setWeaponPack(WeaponPack *weaponPack)
+                { this->weaponPack_ = weaponPack; };
+            inline WeaponPack * getWeaponPack() const
+                { return this->weaponPack_; };
+
+            inline void setWeaponSlot(WeaponSlot * wSlot)
+                { this->weaponSlot_ = wSlot; }
+            inline WeaponSlot * getWeaponSlot() const
+                { return this->weaponSlot_; }
 
         protected:
@@ -102 +107 @@
             std::string munitionType_;
 
-            WeaponSlot * attachedToWeaponSlot_;
+            WeaponSlot * weaponSlot_;
             Munition * munition_;
             WeaponSystem * weaponSystem_;
+            WeaponPack* weaponPack_;
 
             SubclassIdentifier<Munition> munitionIdentifier_;