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

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

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
+#include <vector>
+
 #include "core/BaseObject.h"
-
-#include "WeaponSlot.h"
-
 
 namespace orxonox
@@ -51 +50 @@
             void fire();
 
-            void setFireMode(const unsigned int firemode);
-            const unsigned int getFireMode() const;
+            inline void setFireMode(const unsigned int firemode)
+                { this->firemode_ = firemode; }
+            inline unsigned int getFireMode() const
+                { return this->firemode_; }
 
-            inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
-                { parentWeaponSystem_=parentWeaponSystem; }
-            inline WeaponSystem * getParentWeaponSystem()
-                { return parentWeaponSystem_; }
+            inline void setWeaponSystem(WeaponSystem *weaponSystem)
+                { this->weaponSystem_ = weaponSystem; }
+            inline WeaponSystem * getWeaponSystem() const
+                { return this->weaponSystem_; }
 
         private:
-            WeaponSystem *parentWeaponSystem_;
+            WeaponSystem *weaponSystem_;
             std::vector<WeaponSlot *> setWeaponSlots_;
             unsigned int firemode_;