Changeset 3179

Timestamp:

Jun 15, 2009, 8:20:14 PM (15 years ago)

Author:

rgrieder

Message:

Cleanup in gametypes, infos and items

Location:

code/branches/pch/src/orxonox/objects

Files:

• gametypes/Asteroids.cc (modified) (1 diff)
• gametypes/Asteroids.h (modified) (1 diff)
• gametypes/Deathmatch.cc (modified) (1 diff)
• gametypes/Deathmatch.h (modified) (1 diff)
• gametypes/Gametype.cc (modified) (1 diff)
• gametypes/Gametype.h (modified) (1 diff)
• gametypes/Pong.cc (modified) (1 diff)
• gametypes/Pong.h (modified) (1 diff)
• gametypes/TeamBaseMatch.cc (modified) (1 diff)
• gametypes/TeamBaseMatch.h (modified) (1 diff)
• gametypes/TeamDeathmatch.h (modified) (1 diff)
• gametypes/UnderAttack.cc (modified) (1 diff)
• gametypes/UnderAttack.h (modified) (1 diff)
• infos/Bot.cc (modified) (3 diffs)
• infos/Bot.h (modified) (1 diff)
• infos/GametypeInfo.cc (modified) (1 diff)
• infos/GametypeInfo.h (modified) (1 diff)
• infos/HumanPlayer.cc (modified) (1 diff)
• infos/HumanPlayer.h (modified) (1 diff)
• infos/Info.cc (modified) (1 diff)
• infos/PlayerInfo.cc (modified) (1 diff)
• infos/PongBot.h (modified) (1 diff)
• items/Engine.cc (modified) (2 diffs)
• items/Engine.h (modified) (1 diff)
• items/Item.cc (modified) (2 diffs)
• items/Item.h (modified) (1 diff)
• items/MultiStateEngine.cc (modified) (1 diff)
• items/MultiStateEngine.h (modified) (1 diff)

code/branches/pch/src/orxonox/objects/gametypes/Asteroids.cc

@@ -29 +29 @@
 #include "Asteroids.h"
 
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
-#include "objects/infos/PlayerInfo.h"
+#include "network/Host.h"
 #include "objects/worldentities/pawns/Pawn.h"
-
-#include "network/Host.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/gametypes/Asteroids.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "Gametype.h"
 

code/branches/pch/src/orxonox/objects/gametypes/Deathmatch.cc

@@ -29 +29 @@
 #include "Deathmatch.h"
 
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
+#include "network/Host.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/worldentities/pawns/Pawn.h"
-
-#include "network/Host.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/gametypes/Deathmatch.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "Gametype.h"
 

code/branches/pch/src/orxonox/objects/gametypes/Gametype.cc

@@ -29 +29 @@
 #include "Gametype.h"
 
-#include <cstdlib>
-#include <ctime>
-
+#include "util/Debug.h"
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Template.h"
 #include "core/GameMode.h"
-#include "overlays/OverlayGroup.h"
+#include "core/ObjectList.h"
+
 #include "objects/infos/PlayerInfo.h"
 #include "objects/infos/Bot.h"
+#include "objects/worldentities/Camera.h"
+#include "objects/worldentities/ControllableEntity.h"
+#include "objects/worldentities/SpawnPoint.h"
 #include "objects/worldentities/pawns/Spectator.h"
-#include "objects/worldentities/SpawnPoint.h"
-#include "objects/worldentities/Camera.h"
+#include "overlays/OverlayGroup.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/gametypes/Gametype.h

@@ -33 +33 @@
 
 #include <map>
+#include <set>
+#include <string>
 
 #include "core/BaseObject.h"
 #include "core/Identifier.h"
-#include "objects/worldentities/ControllableEntity.h"
 #include "interfaces/Tickable.h"
 #include "objects/infos/GametypeInfo.h"

code/branches/pch/src/orxonox/objects/gametypes/Pong.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
 #include "core/Executor.h"
-#include "objects/worldentities/Model.h"
 #include "objects/worldentities/PongCenterpoint.h"
 #include "objects/worldentities/PongBall.h"
 #include "objects/worldentities/PongBat.h"
-#include "objects/infos/HumanPlayer.h"
 #include "objects/infos/PongBot.h"
 #include "objects/controllers/PongAI.h"

code/branches/pch/src/orxonox/objects/gametypes/Pong.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "tools/Timer.h"
 #include "Deathmatch.h"
-#include "tools/Timer.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.cc

@@ -29 +29 @@
 #include "TeamBaseMatch.h"
 
+#include "util/Debug.h"
+#include "core/CoreIncludes.h"
+#include "core/Executor.h"
 #include "objects/worldentities/pawns/TeamBaseMatchBase.h"
-#include "core/CoreIncludes.h"
 #include "objects/infos/PlayerInfo.h"
 

code/branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.h

@@ -33 +33 @@
 
 #include <set>
+#include "tools/Timer.h"
 #include "TeamDeathmatch.h"
-#include "tools/Timer.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <map>
 #include <vector>
-
 #include "Deathmatch.h"
 

code/branches/pch/src/orxonox/objects/gametypes/UnderAttack.cc

@@ -29 +29 @@
 #include "UnderAttack.h"
 
+#include "util/Convert.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "util/Convert.h"
 #include "network/Host.h"
-
 #include "objects/worldentities/pawns/Destroyer.h"
 #include "objects/infos/PlayerInfo.h"

code/branches/pch/src/orxonox/objects/gametypes/UnderAttack.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "interfaces/PawnListener.h"
 #include "TeamDeathmatch.h"
-#include "interfaces/PawnListener.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/infos/Bot.cc

@@ -29 +29 @@
 #include "Bot.h"
 
+#include "util/Math.h"
 #include "core/GameMode.h"
 #include "core/CoreIncludes.h"
@@ -34 +35 @@
 #include "objects/gametypes/Gametype.h"
 #include "objects/controllers/AIController.h"
-#include "util/Math.h"
 
 namespace orxonox
@@ -66 +66 @@
     void Bot::setConfigValues()
     {
-        static std::string names[] =
+        static const std::string names[] =
         {
             "Dr. Julius No",

code/branches/pch/src/orxonox/objects/infos/Bot.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
 #include <vector>
-
 #include "PlayerInfo.h"
 

code/branches/pch/src/orxonox/objects/infos/GametypeInfo.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
+#include "core/ObjectList.h"
 #include "network/NetworkFunction.h"
 #include "network/Host.h"

code/branches/pch/src/orxonox/objects/infos/GametypeInfo.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include "Info.h"
 

code/branches/pch/src/orxonox/objects/infos/HumanPlayer.cc

@@ -29 +29 @@
 #include "HumanPlayer.h"
 
-#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/GameMode.h"
 #include "network/ClientInformation.h"
 #include "network/Host.h"

code/branches/pch/src/orxonox/objects/infos/HumanPlayer.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include "PlayerInfo.h"
 

code/branches/pch/src/orxonox/objects/infos/Info.cc

@@ -28 +28 @@
 
 #include "Info.h"
-
 #include "core/CoreIncludes.h"
 

code/branches/pch/src/orxonox/objects/infos/PlayerInfo.cc

@@ -34 +34 @@
 #include "network/ClientInformation.h"
 #include "objects/gametypes/Gametype.h"
+#include "objects/worldentities/ControllableEntity.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/infos/PongBot.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "Bot.h"
 

code/branches/pch/src/orxonox/objects/items/Engine.cc

@@ -29 +29 @@
 #include "Engine.h"
 
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -34 +35 @@
 #include "objects/Scene.h"
 #include "objects/worldentities/pawns/SpaceShip.h"
+#include "objects/pickup/ModifierType.h"
 #include "tools/Shader.h"
 #include "sound/SoundBase.h"

code/branches/pch/src/orxonox/objects/items/Engine.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "interfaces/Tickable.h"
 #include "Item.h"
-#include "interfaces/Tickable.h"
-#include "util/Math.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/items/Item.cc

@@ -28 +28 @@
 
 #include "Item.h"
-
 #include "core/CoreIncludes.h"
 
@@ -37 +36 @@
         RegisterObject(Item);
     }
-
-    Item::~Item()
-    {
-    }
 }

code/branches/pch/src/orxonox/objects/items/Item.h

@@ -41 +41 @@
         public:
             Item(BaseObject* creator);
-            virtual ~Item();
+            virtual ~Item() {}
     };
 }

code/branches/pch/src/orxonox/objects/items/MultiStateEngine.cc

@@ -29 +29 @@
 #include "MultiStateEngine.h"
 
+#include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/worldentities/pawns/SpaceShip.h"

code/branches/pch/src/orxonox/objects/items/MultiStateEngine.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <list>
 #include "Engine.h"