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

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

@@ -43 +43 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void attachWeapon(Weapon *weapon);
-            Weapon * getAttachedWeapon() const;
-            void setAmmoType(bool isUnlimited);
-            void fire();
+            void attachWeapon(Weapon * weapon);
+            void removeWeapon();
+            Weapon * getWeapon() const
+                { return this->weapon_; }
 
-            inline void setWeaponSystem(WeaponSystem *weaponSystem)
+            inline bool isOccupied() const
+                { return (this->weapon_ != 0); }
+
+            inline void setWeaponSystem(WeaponSystem * weaponSystem)
                 { this->weaponSystem_ = weaponSystem; }
             inline WeaponSystem * getWeaponSystem() const
@@ -55 +58 @@
 
         private:
-            Weapon *attachedWeapon_;
-            bool unlimitedAmmo_;
-
-            WeaponSystem *weaponSystem_;
+            WeaponSystem * weaponSystem_;
+            Weapon * weapon_;
     };
 }