Changeset 5724 for code/branches/libraries2/src/modules/weapons/weaponmodes

Timestamp:

Aug 31, 2009, 6:08:26 PM (15 years ago)

Author:

landauf

Message:

moved WeaponsystemPrereqs.h to the weapons module too, renamed as WeaponsPrereqs.h
renamed _WeaponsystemExport as _WeaponsExport
changed paths accordingly
compiles again

Location:

code/branches/libraries2/src/modules/weapons/weaponmodes

Files:

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

code/branches/libraries2/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
+ADD_SOURCE_FILES(WEAPONS_SRC_FILES
   EnergyDrink.cc
   FusionFire.cc

code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -34 +34 @@
 #include "objects/worldentities/Model.h"
 
-#include "objects/weaponsystem/projectiles/Projectile.h"
-#include "objects/weaponsystem/MuzzleFlash.h"
+#include "weapons/projectiles/Projectile.h"
+#include "weapons/MuzzleFlash.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h

@@ -30 +30 @@
 #define _EnergyDrink_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 
 #include <string>
@@ -38 +38 @@
 namespace orxonox
 {
-    class _WeaponsystemExport EnergyDrink : public WeaponMode
+    class _WeaponsExport EnergyDrink : public WeaponMode
     {
         public:

code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -31 +31 @@
 #include "util/Math.h"
 #include "core/CoreIncludes.h"
-#include "objects/weaponsystem/projectiles/BillboardProjectile.h"
+#include "weapons/projectiles/BillboardProjectile.h"
 
 #include "objects/weaponsystem/Weapon.h"

code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h

@@ -30 +30 @@
 #define _FusionFire_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 #include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {
-    class _WeaponsystemExport FusionFire : public WeaponMode
+    class _WeaponsExport FusionFire : public WeaponMode
     {
         public:

code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc

@@ -34 +34 @@
 #include "objects/worldentities/Model.h"
 
-#include "objects/weaponsystem/projectiles/Projectile.h"
-#include "objects/weaponsystem/MuzzleFlash.h"
+#include "weapons/projectiles/Projectile.h"
+#include "weapons/MuzzleFlash.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h

@@ -30 +30 @@
 #define _HsW01_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 
 #include "tools/Timer.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _WeaponsystemExport HsW01 : public WeaponMode
+    class _WeaponsExport HsW01 : public WeaponMode
     {
         public:

code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc

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

code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h

@@ -30 +30 @@
 #define _LaserFire_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 #include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {
-    class _WeaponsystemExport LaserFire : public WeaponMode
+    class _WeaponsExport LaserFire : public WeaponMode
     {
         public:

code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "objects/weaponsystem/projectiles/LightningGunProjectile.h"
+#include "weapons/projectiles/LightningGunProjectile.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h

@@ -30 +30 @@
 #define _LightningGun_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 #include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {
-    class _WeaponsystemExport LightningGun : public WeaponMode
+    class _WeaponsExport LightningGun : public WeaponMode
     {
         public: