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

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+#include "objects/worldentities/StaticEntity.h"
 
-#include "core/BaseObject.h"
-#include "tools/BillboardSet.h"
 #include "tools/Timer.h"
 #include "core/Identifier.h"
-
-#include "WeaponSystem.h"
-#include "Munition.h"
-
-#include "objects/worldentities/StaticEntity.h"
 
 namespace orxonox
@@ -53 +47 @@
 
             virtual void fire();
-            void attachNeededMunition(std::string munitionType);
-            Munition * getAttachedMunition(std::string munitiontype);
+            void attachNeededMunition(const std::string& munitionType);
+            Munition * getAttachedMunition(const std::string& munitiontype);
 
             //reloading
@@ -63 +57 @@
 
             //XMLPort functions
-            virtual void setMunitionType(std::string munitionType);
-            virtual const std::string getMunitionType();
+            virtual void setMunitionType(const std::string& munitionType);
+            virtual const std::string& getMunitionType() const;
             virtual void setBulletLoadingTime(float loadingTime);
-            virtual const float getBulletLoadingTime();
+            virtual const float getBulletLoadingTime() const;
             virtual void setMagazineLoadingTime(float loadingTime);
-            virtual const float getMagazineLoadingTime();
+            virtual const float getMagazineLoadingTime() const;
             virtual void setBulletAmount(unsigned int amount);
-            virtual const unsigned int getBulletAmount();
+            virtual const unsigned int getBulletAmount() const;
             virtual void setMagazineAmount(unsigned int amount);
-            virtual const unsigned int getMagazineAmount();
+            virtual const unsigned int getMagazineAmount() const;
             virtual void setUnlimitedMunition(bool unlimitedMunition);
-            virtual const bool getUnlimitedMunition();
+            virtual const bool getUnlimitedMunition() const;
 
             //weapon actions
@@ -86 +80 @@
             virtual void setWeapon();
             virtual void setMunition();
-            
-            inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
-                { this->parentWeaponSystem_=parentWeaponSystem; };
-            inline WeaponSystem * getParentWeaponSystem()
-                { return this->parentWeaponSystem_; };
+
+            inline void setWeaponSystem(WeaponSystem *weaponSystem)
+                { this->weaponSystem_ = weaponSystem; };
+            inline WeaponSystem * getWeaponSystem() const
+                { return this->weaponSystem_; };
 
             inline void setAttachedToWeaponSlot(WeaponSlot * wSlot)
                 { this->attachedToWeaponSlot_ = wSlot; }
-            inline WeaponSlot * getAttachedToWeaponSlot()
+            inline WeaponSlot * getAttachedToWeaponSlot() const
                 { return this->attachedToWeaponSlot_; }
-
-
-        private:
 
         protected:
@@ -113 +104 @@
             WeaponSlot * attachedToWeaponSlot_;
             Munition * munition_;
-            WeaponSystem * parentWeaponSystem_;
+            WeaponSystem * weaponSystem_;
 
             SubclassIdentifier<Munition> munitionIdentifier_;