Changeset 3185 for code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes

Timestamp:

Jun 16, 2009, 12:35:20 PM (15 years ago)

Author:

rgrieder

Message:

Cleanup in the weapon system.

Location:

code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes

Files:

• EnergyDrink.cc (modified) (2 diffs)
• EnergyDrink.h (modified) (2 diffs)
• FusionFire.cc (modified) (1 diff)
• HsW01.cc (modified) (1 diff)
• HsW01.h (modified) (1 diff)
• LaserFire.cc (modified) (1 diff)
• LightningGun.cc (modified) (1 diff)

code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "core/Executor.h"
 #include "core/XMLPort.h"
-#include "objects/weaponsystem/projectiles/ParticleProjectile.h"
 #include "objects/worldentities/Model.h"
+
+#include "objects/weaponsystem/projectiles/Projectile.h"
 #include "objects/weaponsystem/MuzzleFlash.h"
-
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
@@ -69 +70 @@
     {
         this->material_ = material;
-    }
-
-    std::string& EnergyDrink::getMaterial()
-    {
-        return this->material_;
     }
 

code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "tools/Timer.h"
 #include "objects/weaponsystem/WeaponMode.h"
-#include "tools/Timer.h"
 
 namespace orxonox
@@ -47 +49 @@
         private:
             void setMaterial(const std::string& material);
-            std::string& getMaterial();
+            inline const std::string& getMaterial()
+                { return this->material_; }
             void setDelay(float d);
             float getDelay() const;

code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc

@@ -29 +29 @@
 #include "FusionFire.h"
 
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "objects/weaponsystem/projectiles/BillboardProjectile.h"

code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "core/Executor.h"
 #include "core/XMLPort.h"
-#include "objects/weaponsystem/projectiles/ParticleProjectile.h"
 #include "objects/worldentities/Model.h"
+
+#include "objects/weaponsystem/projectiles/Projectile.h"
 #include "objects/weaponsystem/MuzzleFlash.h"
-
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include "tools/Timer.h"
 #include "objects/weaponsystem/WeaponMode.h"
-#include "tools/Timer.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "objects/weaponsystem/projectiles/ParticleProjectile.h"
-
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-
-#include "objects/worldentities/Billboard.h"
-
+#include "objects/weaponsystem/projectiles/LightningGunProjectile.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
 #include "objects/weaponsystem/WeaponSystem.h"
-
-#include "objects/weaponsystem/projectiles/LightningGunProjectile.h"
-
-#include "util/Math.h"
 
 namespace orxonox