Changeset 3186 for code/branches/pch/src/orxonox/objects/worldentities/pawns

Timestamp:

Jun 16, 2009, 2:25:05 PM (16 years ago)

Author:

rgrieder

Message:

Last part of the cleanup: world entities.

Location:

code/branches/pch/src/orxonox/objects/worldentities/pawns

Files:

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

code/branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -29 +29 @@
 #include "Pawn.h"
 
+#include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "util/Math.h"
+#include "network/NetworkFunction.h"
+
+#include "interfaces/PawnListener.h"
 #include "PawnManager.h"
-#include "interfaces/PawnListener.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
@@ -40 +41 @@
 #include "objects/worldentities/ExplosionChunk.h"
 #include "objects/worldentities/BigExplosion.h"
-
 #include "objects/weaponsystem/WeaponSystem.h"
 #include "objects/weaponsystem/WeaponSlot.h"
@@ -46 +46 @@
 #include "objects/weaponsystem/WeaponSet.h"
 
-#include "network/NetworkFunction.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "interfaces/RadarViewable.h"
 #include "objects/worldentities/ControllableEntity.h"
-#include "interfaces/RadarViewable.h"
 #include "objects/pickup/PickupCollection.h"
 

code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -31 +31 @@
 #include <BulletDynamics/Dynamics/btRigidBody.h>
 
-#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"

code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include <LinearMath/btVector3.h>
-
+#include "util/Math.h"
 #include "Pawn.h"
 

code/branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc

@@ -34 +34 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/GameMode.h"
-#include "objects/worldentities/Model.h"
+
+#include "tools/BillboardSet.h"
 #include "objects/Scene.h"
 #include "objects/infos/PlayerInfo.h"
-#include "objects/gametypes/Gametype.h"
-#include "tools/BillboardSet.h"
-#include "overlays/OverlayText.h"
-#include "overlays/OverlayGroup.h"
-#include "util/Convert.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "util/Math.h"
 #include "objects/worldentities/ControllableEntity.h"
 

code/branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc

@@ -29 +29 @@
 
 #include "TeamBaseMatchBase.h"
+
 #include "core/CoreIncludes.h"
+#include "interfaces/PawnListener.h"
+#include "interfaces/TeamColourable.h"
 #include "objects/gametypes/TeamBaseMatch.h"
-#include "interfaces/TeamColourable.h"
-#include "interfaces/PawnListener.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h

@@ -30 +30 @@
 #define _TeamBaseMatchBase_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include "Pawn.h"
 
 namespace orxonox
 {
-
-
     namespace BaseState
     {