Changeset 5735 for code/branches/libraries2/src/orxonox/worldentities/pawns

Timestamp:

Sep 1, 2009, 12:38:36 AM (15 years ago)

Author:

landauf

Message:

Removed /objects/ from all paths (except from those in the objects module of course).
Compiles again.

Location:

code/branches/libraries2/src/orxonox/worldentities/pawns

Files:

• Destroyer.cc (modified) (1 diff)
• Pawn.cc (modified) (1 diff)
• Pawn.h (modified) (2 diffs)
• SpaceShip.cc (modified) (1 diff)
• Spectator.cc (modified) (1 diff)
• Spectator.h (modified) (1 diff)
• TeamBaseMatchBase.cc (modified) (1 diff)

code/branches/libraries2/src/orxonox/worldentities/pawns/Destroyer.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "objects/gametypes/UnderAttack.h"
+#include "gametypes/UnderAttack.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -38 +38 @@
 #include "interfaces/PawnListener.h"
 #include "PawnManager.h"
-#include "objects/infos/PlayerInfo.h"
-#include "objects/gametypes/Gametype.h"
-#include "objects/worldentities/ParticleSpawner.h"
-#include "objects/worldentities/ExplosionChunk.h"
-#include "objects/worldentities/BigExplosion.h"
-#include "objects/weaponsystem/WeaponSystem.h"
-#include "objects/weaponsystem/WeaponSlot.h"
-#include "objects/weaponsystem/WeaponPack.h"
-#include "objects/weaponsystem/WeaponSet.h"
+#include "infos/PlayerInfo.h"
+#include "gametypes/Gametype.h"
+#include "worldentities/ParticleSpawner.h"
+#include "worldentities/ExplosionChunk.h"
+#include "worldentities/BigExplosion.h"
+#include "weaponsystem/WeaponSystem.h"
+#include "weaponsystem/WeaponSlot.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSet.h"
 
 

code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.h

@@ -34 +34 @@
 #include <string>
 #include "interfaces/RadarViewable.h"
-#include "objects/worldentities/ControllableEntity.h"
-#include "objects/pickup/PickupCollection.h"
+#include "worldentities/ControllableEntity.h"
+#include "pickup/PickupCollection.h"
 
 namespace orxonox
@@ -114 +114 @@
             virtual void useItem()
                 { this->pickups_.useItem(); }
-            
+
             virtual void startLocalHumanControl();
 

code/branches/libraries2/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -35 +35 @@
 #include "core/Template.h"
 #include "core/XMLPort.h"
-#include "objects/items/Engine.h"
+#include "items/Engine.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.cc

@@ -34 +34 @@
 
 #include "tools/BillboardSet.h"
-#include "objects/Scene.h"
-#include "objects/infos/PlayerInfo.h"
+#include "Scene.h"
+#include "infos/PlayerInfo.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.h

@@ -33 +33 @@
 
 #include "util/Math.h"
-#include "objects/worldentities/ControllableEntity.h"
+#include "worldentities/ControllableEntity.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc

@@ -33 +33 @@
 #include "interfaces/PawnListener.h"
 #include "interfaces/TeamColourable.h"
-#include "objects/gametypes/TeamBaseMatch.h"
+#include "gametypes/TeamBaseMatch.h"
 
 namespace orxonox