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

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/projectiles

Files:

• BillboardProjectile.h (modified) (2 diffs)
• CMakeLists.txt (modified) (1 diff)
• LightningGunProjectile.h (modified) (2 diffs)
• ParticleProjectile.h (modified) (1 diff)
• Projectile.h (modified) (2 diffs)

code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.h

@@ -30 +30 @@
 #define _BillboardProjectile_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 
 #include "util/Math.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _WeaponsystemExport BillboardProjectile : public Projectile
+    class _WeaponsExport BillboardProjectile : public Projectile
     {
         public:

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

@@ -1 @@
-ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
+ADD_SOURCE_FILES(WEAPONS_SRC_FILES
   BillboardProjectile.cc
   ParticleProjectile.cc

code/branches/libraries2/src/modules/weapons/projectiles/LightningGunProjectile.h

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

code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.h

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

code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h

@@ -30 +30 @@
 #define _Projectile_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 
 #include "tools/Timer.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _WeaponsystemExport Projectile : public MovableEntity, public PawnListener
+    class _WeaponsExport Projectile : public MovableEntity, public PawnListener
     {
         public: