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

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
-#include "Weapon.h"
 #include "objects/worldentities/StaticEntity.h"
 
@@ -50 +48 @@
             void fire();
 
-            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_; }
 
 
@@ -60 +58 @@
             bool unlimitedAmmo_;
 
-            WeaponSystem *parentWeaponSystem_;
+            WeaponSystem *weaponSystem_;
     };
 }