Changeset 2912 for code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h

Timestamp:

Apr 9, 2009, 3:18:11 AM (15 years ago)

Author:

landauf

Message:

Several small adjustments in the weaponsystem (like additional const keyword, includes moved from .h to .cc where possible, …)

Firemode is now an unsigned int instead of an Enum. Instead of "fire" and "altFire" use "fire 0" and "fire 1"

File:

• code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h (modified) (2 diffs)

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

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
+#include <vector>
+
 #include "core/BaseObject.h"
-
-#include "Weapon.h"
-
 
 namespace orxonox
@@ -50 +49 @@
             void fire();
 
-            Weapon * getWeaponPointer(unsigned int n);
-            int getSize();
+            Weapon * getWeaponPointer(unsigned int n) const;
+            int getSize() const;
 
             void setFireMode(unsigned int firemode);
-            unsigned int getFireMode();
+            unsigned int getFireMode() const;
 
             void addWeapon(Weapon * weapon);
-            const Weapon * getWeapon(unsigned int index);
+            const Weapon * getWeapon(unsigned int index) const;
+
+            void attachNeededMunitionToAllWeapons();
 
             //functions with effect to all weapons of the weaponPack
             //functions needed for creating Pointer to the right objects (-->Pawn.cc)
-            void setParentWeaponSystemToAllWeapons(WeaponSystem * weaponSystem);
-            void attachNeededMunitionToAllWeapons();
-
-            inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
-                { parentWeaponSystem_=parentWeaponSystem; }
-            inline WeaponSystem * getParentWeaponSystem()
-                { return parentWeaponSystem_; }
+            inline void setWeaponSystem(WeaponSystem *weaponSystem)
+                { this->weaponSystem_ = weaponSystem; this->setWeaponSystemToAllWeapons(weaponSystem); }
+            inline WeaponSystem * getWeaponSystem() const
+                { return this->weaponSystem_; }
 
         private:
+            void setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem);
+
             std::vector<Weapon *> weapons_;
-            WeaponSystem *parentWeaponSystem_;
+            WeaponSystem *weaponSystem_;
             unsigned int firemode_;
     };