[Orxonox-commit 653] r3185 - in branches/pch/src/orxonox/objects/weaponsystem: . munitions projectiles weaponmodes

rgrieder at orxonox.net rgrieder at orxonox.net
Tue Jun 16 12:35:21 CEST 2009


Author: rgrieder
Date: 2009-06-16 12:35:20 +0200 (Tue, 16 Jun 2009)
New Revision: 3185

Modified:
   branches/pch/src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.cc
   branches/pch/src/orxonox/objects/weaponsystem/Munition.cc
   branches/pch/src/orxonox/objects/weaponsystem/Munition.h
   branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.cc
   branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.h
   branches/pch/src/orxonox/objects/weaponsystem/Weapon.h
   branches/pch/src/orxonox/objects/weaponsystem/WeaponMode.h
   branches/pch/src/orxonox/objects/weaponsystem/WeaponPack.cc
   branches/pch/src/orxonox/objects/weaponsystem/WeaponPack.h
   branches/pch/src/orxonox/objects/weaponsystem/WeaponSet.h
   branches/pch/src/orxonox/objects/weaponsystem/WeaponSystem.h
   branches/pch/src/orxonox/objects/weaponsystem/munitions/FusionMunition.cc
   branches/pch/src/orxonox/objects/weaponsystem/munitions/LaserMunition.cc
   branches/pch/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.cc
   branches/pch/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h
   branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc
   branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h
   branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc
   branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h
   branches/pch/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc
   branches/pch/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h
   branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc
   branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.h
   branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc
   branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h
   branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc
   branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc
   branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h
   branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc
   branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc
Log:
Cleanup in the weapon system.

Modified: branches/pch/src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -30,7 +30,6 @@
 
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-
 #include "WeaponSystem.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/Munition.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/Munition.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/Munition.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -28,7 +28,6 @@
  */
 
 #include "Munition.h"
-
 #include "core/CoreIncludes.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/Munition.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/Munition.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/Munition.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -33,7 +33,6 @@
 #include "OrxonoxPrereqs.h"
 
 #include <map>
-
 #include "core/BaseObject.h"
 #include "tools/Timer.h"
 

Modified: branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -29,10 +29,8 @@
 
 #include "MuzzleFlash.h"
 
-#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "util/Math.h"
+#include "core/Executor.h"
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -30,10 +30,10 @@
 #define _MuzzleFlash_H__
 
 #include "OrxonoxPrereqs.h"
+
+#include "tools/Timer.h"
 #include "objects/worldentities/Billboard.h"
-#include "tools/Timer.h"
 
-
 namespace orxonox
 {
     class _OrxonoxExport MuzzleFlash : public Billboard

Modified: branches/pch/src/orxonox/objects/weaponsystem/Weapon.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/Weapon.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/Weapon.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -31,9 +31,10 @@
 #define _Weapon_H__
 
 #include "OrxonoxPrereqs.h"
-#include "objects/worldentities/StaticEntity.h"
 
+#include <map>
 #include "tools/Timer.h"
+#include "objects/worldentities/StaticEntity.h"
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/objects/weaponsystem/WeaponMode.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/WeaponMode.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/WeaponMode.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -31,11 +31,12 @@
 #define _WeaponMode_H__
 
 #include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "util/Math.h"
 #include "core/BaseObject.h"
-
+#include "core/Identifier.h"
 #include "tools/Timer.h"
-#include "core/Identifier.h"
-#include "util/Math.h"
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/objects/weaponsystem/WeaponPack.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/WeaponPack.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/WeaponPack.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -30,10 +30,8 @@
 
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
 
 #include "Weapon.h"
-#include "WeaponSlot.h"
 #include "WeaponSystem.h"
 #include "DefaultWeaponmodeLink.h"
 

Modified: branches/pch/src/orxonox/objects/weaponsystem/WeaponPack.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/WeaponPack.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/WeaponPack.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -33,7 +33,6 @@
 #include "OrxonoxPrereqs.h"
 
 #include <set>
-
 #include "core/BaseObject.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/WeaponSet.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/WeaponSet.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/WeaponSet.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -33,7 +33,6 @@
 #include "OrxonoxPrereqs.h"
 
 #include <map>
-
 #include "core/BaseObject.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/WeaponSystem.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/WeaponSystem.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/WeaponSystem.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -32,10 +32,9 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <set>
 #include <map>
+#include <set>
 #include <vector>
-
 #include "core/BaseObject.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/munitions/FusionMunition.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/munitions/FusionMunition.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/munitions/FusionMunition.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -27,7 +27,6 @@
  */
 
 #include "FusionMunition.h"
-
 #include "core/CoreIncludes.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/munitions/LaserMunition.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/munitions/LaserMunition.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/munitions/LaserMunition.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -27,7 +27,6 @@
  */
 
 #include "LaserMunition.h"
-
 #include "core/CoreIncludes.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -27,7 +27,6 @@
  */
 
 #include "ReplenishingMunition.h"
-
 #include "core/CoreIncludes.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -30,8 +30,9 @@
 #define _ReplenishingMunition_H__
 
 #include "OrxonoxPrereqs.h"
+
+#include "tools/Timer.h"
 #include "objects/weaponsystem/Munition.h"
-#include "tools/Timer.h"
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -29,9 +29,8 @@
 #include "BillboardProjectile.h"
 
 #include <OgreBillboardSet.h>
-
-#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
+#include "core/GameMode.h"
 #include "objects/Scene.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -31,9 +31,9 @@
 
 #include "OrxonoxPrereqs.h"
 
+#include "util/Math.h"
+#include "tools/BillboardSet.h"
 #include "Projectile.h"
-#include "tools/BillboardSet.h"
-#include "util/Math.h"
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -28,12 +28,8 @@
 
 #include "LightningGunProjectile.h"
 
-#include <OgreBillboardSet.h>
-
-#include "core/GameMode.h"
-#include "core/CoreIncludes.h"
-#include "objects/Scene.h"
 #include "util/Convert.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -31,8 +31,8 @@
 
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include "tools/Timer.h"
-
 #include "BillboardProjectile.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -31,9 +31,8 @@
 #include <OgreParticleSystem.h>
 #include <OgreParticleEmitter.h>
 
-#include "core/GameMode.h"
+#include "tools/ParticleInterface.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
 #include "objects/Scene.h"
 
 namespace orxonox

Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -30,10 +30,7 @@
 #define _ParticleProjectile_H__
 
 #include "OrxonoxPrereqs.h"
-
 #include "BillboardProjectile.h"
-#include "tools/ParticleInterface.h"
-#include "util/Math.h"
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -28,18 +28,13 @@
 
 #include "Projectile.h"
 
-#include <OgreBillboard.h>
-
 #include "core/CoreIncludes.h"
-#include "core/Executor.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/ObjectList.h"
-#include "tools/ParticleInterface.h"
-
-#include "objects/worldentities/Model.h"
-#include "objects/worldentities/ParticleSpawner.h"
-#include "objects/collisionshapes/SphereCollisionShape.h"
+#include "core/Executor.h"
 #include "core/GameMode.h"
+#include "objects/collisionshapes/SphereCollisionShape.h"
+#include "objects/worldentities/pawns/Pawn.h"
+#include "objects/worldentities/ParticleSpawner.h"
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -31,10 +31,9 @@
 
 #include "OrxonoxPrereqs.h"
 
+#include "tools/Timer.h"
 #include "interfaces/PawnListener.h"
 #include "objects/worldentities/MovableEntity.h"
-#include "objects/worldentities/pawns/Pawn.h"
-#include "tools/Timer.h"
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -29,11 +29,12 @@
 #include "EnergyDrink.h"
 
 #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/MuzzleFlash.h"
 
+#include "objects/weaponsystem/projectiles/Projectile.h"
+#include "objects/weaponsystem/MuzzleFlash.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
 #include "objects/weaponsystem/WeaponSystem.h"
@@ -70,11 +71,6 @@
         this->material_ = material;
     }
 
-    std::string& EnergyDrink::getMaterial()
-    {
-        return this->material_;
-    }
-
     void EnergyDrink::setDelay(float d)
     {
         this->delay_ = d;

Modified: branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -30,8 +30,10 @@
 #define _EnergyDrink_H__
 
 #include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "tools/Timer.h"
 #include "objects/weaponsystem/WeaponMode.h"
-#include "tools/Timer.h"
 
 namespace orxonox
 {
@@ -46,7 +48,8 @@
 
         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;
             void shot();

Modified: branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -28,6 +28,7 @@
 
 #include "FusionFire.h"
 
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "objects/weaponsystem/projectiles/BillboardProjectile.h"
 

Modified: branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -29,11 +29,12 @@
 #include "HsW01.h"
 
 #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"
 #include "objects/weaponsystem/WeaponSystem.h"

Modified: branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h	2009-06-16 10:35:20 UTC (rev 3185)
@@ -30,8 +30,9 @@
 #define _HsW01_H__
 
 #include "OrxonoxPrereqs.h"
+
+#include "tools/Timer.h"
 #include "objects/weaponsystem/WeaponMode.h"
-#include "tools/Timer.h"
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -30,7 +30,6 @@
 
 #include "core/CoreIncludes.h"
 #include "objects/weaponsystem/projectiles/ParticleProjectile.h"
-
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
 #include "objects/weaponsystem/WeaponSystem.h"

Modified: branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc	2009-06-15 21:45:29 UTC (rev 3184)
+++ branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc	2009-06-16 10:35:20 UTC (rev 3185)
@@ -29,17 +29,11 @@
 #include "LightningGun.h"
 
 #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
 {
     CreateFactory(LightningGun);




More information about the Orxonox-commit mailing list