[Orxonox-commit 276] r2923 - in branches/weapons/src/orxonox/objects: . weaponsystem/munitions weaponsystem/weaponmodes worldentities/pawns

[landauf at orxonox.net]

Author: landauf
Date: 2009-04-18 19:21:36 +0200 (Sat, 18 Apr 2009)
New Revision: 2923

Modified:
   branches/weapons/src/orxonox/objects/CMakeLists.txt
   branches/weapons/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h
   branches/weapons/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h
   branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc
   branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h
   branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc
   branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h
   branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc
Log:
adjusted weaponsystem-path in (hopefully) all files.

Modified: branches/weapons/src/orxonox/objects/CMakeLists.txt
===================================================================
--- branches/weapons/src/orxonox/objects/CMakeLists.txt	2009-04-18 17:12:25 UTC (rev 2922)
+++ branches/weapons/src/orxonox/objects/CMakeLists.txt	2009-04-18 17:21:36 UTC (rev 2923)
@@ -21,6 +21,6 @@
 ADD_SUBDIRECTORY(items)
 ADD_SUBDIRECTORY(pickup)
 ADD_SUBDIRECTORY(quest)
-ADD_SUBDIRECTORY(weaponSystem)
+ADD_SUBDIRECTORY(weaponsystem)
 ADD_SUBDIRECTORY(worldentities)
 

Modified: branches/weapons/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h
===================================================================
--- branches/weapons/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h	2009-04-18 17:12:25 UTC (rev 2922)
+++ branches/weapons/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h	2009-04-18 17:21:36 UTC (rev 2923)
@@ -30,7 +30,7 @@
 #define _FusionMunition_H__
 
 #include "OrxonoxPrereqs.h"
-#include "objects/weaponSystem/Munition.h"
+#include "objects/weaponsystem/Munition.h"
 
 namespace orxonox
 {

Modified: branches/weapons/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h
===================================================================
--- branches/weapons/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h	2009-04-18 17:12:25 UTC (rev 2922)
+++ branches/weapons/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h	2009-04-18 17:21:36 UTC (rev 2923)
@@ -30,7 +30,7 @@
 #define _ReplenishingMunition_H__
 
 #include "OrxonoxPrereqs.h"
-#include "objects/weaponSystem/Munition.h"
+#include "objects/weaponsystem/Munition.h"
 #include "tools/Timer.h"
 
 namespace orxonox

Modified: branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc
===================================================================
--- branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc	2009-04-18 17:12:25 UTC (rev 2922)
+++ branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc	2009-04-18 17:21:36 UTC (rev 2923)
@@ -30,11 +30,11 @@
 #include "FusionFire.h"
 
 #include "core/CoreIncludes.h"
-#include "objects/weaponSystem/projectiles/BillboardProjectile.h"
+#include "objects/weaponsystem/projectiles/BillboardProjectile.h"
 
-#include "objects/weaponSystem/Weapon.h"
-#include "objects/weaponSystem/WeaponPack.h"
-#include "objects/weaponSystem/WeaponSystem.h"
+#include "objects/weaponsystem/Weapon.h"
+#include "objects/weaponsystem/WeaponPack.h"
+#include "objects/weaponsystem/WeaponSystem.h"
 
 namespace orxonox
 {

Modified: branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h
===================================================================
--- branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h	2009-04-18 17:12:25 UTC (rev 2922)
+++ branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h	2009-04-18 17:21:36 UTC (rev 2923)
@@ -30,7 +30,7 @@
 #define _FusionFire_H__
 
 #include "OrxonoxPrereqs.h"
-#include "objects/weaponSystem/WeaponMode.h"
+#include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {

Modified: branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc
===================================================================
--- branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc	2009-04-18 17:12:25 UTC (rev 2922)
+++ branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc	2009-04-18 17:21:36 UTC (rev 2923)
@@ -30,11 +30,11 @@
 #include "LaserFire.h"
 
 #include "core/CoreIncludes.h"
-#include "objects/weaponSystem/projectiles/ParticleProjectile.h"
+#include "objects/weaponsystem/projectiles/ParticleProjectile.h"
 
-#include "objects/weaponSystem/Weapon.h"
-#include "objects/weaponSystem/WeaponPack.h"
-#include "objects/weaponSystem/WeaponSystem.h"
+#include "objects/weaponsystem/Weapon.h"
+#include "objects/weaponsystem/WeaponPack.h"
+#include "objects/weaponsystem/WeaponSystem.h"
 
 namespace orxonox
 {

Modified: branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h
===================================================================
--- branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h	2009-04-18 17:12:25 UTC (rev 2922)
+++ branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h	2009-04-18 17:21:36 UTC (rev 2923)
@@ -30,7 +30,7 @@
 #define _LaserFire_H__
 
 #include "OrxonoxPrereqs.h"
-#include "objects/weaponSystem/WeaponMode.h"
+#include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {

Modified: branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc
===================================================================
--- branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc	2009-04-18 17:12:25 UTC (rev 2922)
+++ branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc	2009-04-18 17:21:36 UTC (rev 2923)
@@ -38,10 +38,10 @@
 #include "objects/gametypes/Gametype.h"
 #include "objects/worldentities/ParticleSpawner.h"
 #include "objects/worldentities/ExplosionChunk.h"
-#include "objects/weaponSystem/WeaponSystem.h"
-#include "objects/weaponSystem/WeaponSlot.h"
-#include "objects/weaponSystem/WeaponPack.h"
-#include "objects/weaponSystem/WeaponSet.h"
+#include "objects/weaponsystem/WeaponSystem.h"
+#include "objects/weaponsystem/WeaponSlot.h"
+#include "objects/weaponsystem/WeaponPack.h"
+#include "objects/weaponsystem/WeaponSet.h"
 
 namespace orxonox
 {