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

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/Weapon.cc (modified) (1 diff)

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

@@ -47 +47 @@
         this->magazineReadyToShoot_ = true;
         this->weaponSystem_ = 0;
-        this->attachedToWeaponSlot_ = 0;
+        this->weaponPack_ = 0;
+        this->weaponSlot_ = 0;
         this->bulletLoadingTime_ = 0;
         this->magazineLoadingTime_ = 0;