[Orxonox-commit 647] r3179 - in branches/pch/src/orxonox/objects: gametypes infos items
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Jun 15 20:20:15 CEST 2009
Author: rgrieder
Date: 2009-06-15 20:20:14 +0200 (Mon, 15 Jun 2009)
New Revision: 3179
Modified:
branches/pch/src/orxonox/objects/gametypes/Asteroids.cc
branches/pch/src/orxonox/objects/gametypes/Asteroids.h
branches/pch/src/orxonox/objects/gametypes/Deathmatch.cc
branches/pch/src/orxonox/objects/gametypes/Deathmatch.h
branches/pch/src/orxonox/objects/gametypes/Gametype.cc
branches/pch/src/orxonox/objects/gametypes/Gametype.h
branches/pch/src/orxonox/objects/gametypes/Pong.cc
branches/pch/src/orxonox/objects/gametypes/Pong.h
branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.cc
branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.h
branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.h
branches/pch/src/orxonox/objects/gametypes/UnderAttack.cc
branches/pch/src/orxonox/objects/gametypes/UnderAttack.h
branches/pch/src/orxonox/objects/infos/Bot.cc
branches/pch/src/orxonox/objects/infos/Bot.h
branches/pch/src/orxonox/objects/infos/GametypeInfo.cc
branches/pch/src/orxonox/objects/infos/GametypeInfo.h
branches/pch/src/orxonox/objects/infos/HumanPlayer.cc
branches/pch/src/orxonox/objects/infos/HumanPlayer.h
branches/pch/src/orxonox/objects/infos/Info.cc
branches/pch/src/orxonox/objects/infos/PlayerInfo.cc
branches/pch/src/orxonox/objects/infos/PongBot.h
branches/pch/src/orxonox/objects/items/Engine.cc
branches/pch/src/orxonox/objects/items/Engine.h
branches/pch/src/orxonox/objects/items/Item.cc
branches/pch/src/orxonox/objects/items/Item.h
branches/pch/src/orxonox/objects/items/MultiStateEngine.cc
branches/pch/src/orxonox/objects/items/MultiStateEngine.h
Log:
Cleanup in gametypes, infos and items
Modified: branches/pch/src/orxonox/objects/gametypes/Asteroids.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Asteroids.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/Asteroids.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -28,12 +28,11 @@
#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
{
CreateUnloadableFactory(Asteroids);
Modified: branches/pch/src/orxonox/objects/gametypes/Asteroids.h
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Asteroids.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/Asteroids.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -30,7 +30,6 @@
#define _Asteroids_H__
#include "OrxonoxPrereqs.h"
-
#include "Gametype.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/gametypes/Deathmatch.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Deathmatch.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/Deathmatch.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -28,12 +28,12 @@
#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
{
CreateUnloadableFactory(Deathmatch);
Modified: branches/pch/src/orxonox/objects/gametypes/Deathmatch.h
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Deathmatch.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/Deathmatch.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -30,7 +30,6 @@
#define _Deathmatch_H__
#include "OrxonoxPrereqs.h"
-
#include "Gametype.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/gametypes/Gametype.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Gametype.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/Gametype.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -28,19 +28,20 @@
#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
{
Modified: branches/pch/src/orxonox/objects/gametypes/Gametype.h
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Gametype.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/Gametype.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -32,10 +32,11 @@
#include "OrxonoxPrereqs.h"
#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"
Modified: branches/pch/src/orxonox/objects/gametypes/Pong.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Pong.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/Pong.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -29,13 +29,10 @@
#include "Pong.h"
#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"
Modified: branches/pch/src/orxonox/objects/gametypes/Pong.h
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Pong.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/Pong.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "tools/Timer.h"
#include "Deathmatch.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -28,8 +28,10 @@
#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"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.h
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -32,8 +32,8 @@
#include "OrxonoxPrereqs.h"
#include <set>
+#include "tools/Timer.h"
#include "TeamDeathmatch.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.h
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include <map>
#include <vector>
-
#include "Deathmatch.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/gametypes/UnderAttack.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/UnderAttack.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/UnderAttack.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -28,11 +28,10 @@
#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"
Modified: branches/pch/src/orxonox/objects/gametypes/UnderAttack.h
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/UnderAttack.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/gametypes/UnderAttack.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "interfaces/PawnListener.h"
#include "TeamDeathmatch.h"
-#include "interfaces/PawnListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/infos/Bot.cc
===================================================================
--- branches/pch/src/orxonox/objects/infos/Bot.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/infos/Bot.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -28,12 +28,12 @@
#include "Bot.h"
+#include "util/Math.h"
#include "core/GameMode.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "objects/gametypes/Gametype.h"
#include "objects/controllers/AIController.h"
-#include "util/Math.h"
namespace orxonox
{
@@ -65,7 +65,7 @@
void Bot::setConfigValues()
{
- static std::string names[] =
+ static const std::string names[] =
{
"Dr. Julius No",
"Rosa Klebb",
Modified: branches/pch/src/orxonox/objects/infos/Bot.h
===================================================================
--- branches/pch/src/orxonox/objects/infos/Bot.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/infos/Bot.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -30,8 +30,8 @@
#define _Bot_H__
#include "OrxonoxPrereqs.h"
+
#include <vector>
-
#include "PlayerInfo.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/infos/GametypeInfo.cc
===================================================================
--- branches/pch/src/orxonox/objects/infos/GametypeInfo.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/infos/GametypeInfo.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -30,6 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
+#include "core/ObjectList.h"
#include "network/NetworkFunction.h"
#include "network/Host.h"
#include "interfaces/GametypeMessageListener.h"
Modified: branches/pch/src/orxonox/objects/infos/GametypeInfo.h
===================================================================
--- branches/pch/src/orxonox/objects/infos/GametypeInfo.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/infos/GametypeInfo.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -31,6 +31,7 @@
#include "OrxonoxPrereqs.h"
+#include <string>
#include "Info.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/infos/HumanPlayer.cc
===================================================================
--- branches/pch/src/orxonox/objects/infos/HumanPlayer.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/infos/HumanPlayer.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -28,9 +28,9 @@
#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"
#include "objects/controllers/HumanController.h"
Modified: branches/pch/src/orxonox/objects/infos/HumanPlayer.h
===================================================================
--- branches/pch/src/orxonox/objects/infos/HumanPlayer.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/infos/HumanPlayer.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -31,6 +31,7 @@
#include "OrxonoxPrereqs.h"
+#include <string>
#include "PlayerInfo.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/infos/Info.cc
===================================================================
--- branches/pch/src/orxonox/objects/infos/Info.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/infos/Info.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -27,7 +27,6 @@
*/
#include "Info.h"
-
#include "core/CoreIncludes.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/infos/PlayerInfo.cc
===================================================================
--- branches/pch/src/orxonox/objects/infos/PlayerInfo.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/infos/PlayerInfo.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -33,6 +33,7 @@
#include "core/CoreIncludes.h"
#include "network/ClientInformation.h"
#include "objects/gametypes/Gametype.h"
+#include "objects/worldentities/ControllableEntity.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/infos/PongBot.h
===================================================================
--- branches/pch/src/orxonox/objects/infos/PongBot.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/infos/PongBot.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -30,7 +30,6 @@
#define _PongBot_H__
#include "OrxonoxPrereqs.h"
-
#include "Bot.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/items/Engine.cc
===================================================================
--- branches/pch/src/orxonox/objects/items/Engine.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/items/Engine.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -28,11 +28,13 @@
#include "Engine.h"
+#include "util/Math.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "core/XMLPort.h"
#include "objects/Scene.h"
#include "objects/worldentities/pawns/SpaceShip.h"
+#include "objects/pickup/ModifierType.h"
#include "tools/Shader.h"
#include "sound/SoundBase.h"
Modified: branches/pch/src/orxonox/objects/items/Engine.h
===================================================================
--- branches/pch/src/orxonox/objects/items/Engine.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/items/Engine.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -31,9 +31,8 @@
#include "OrxonoxPrereqs.h"
-#include "Item.h"
#include "interfaces/Tickable.h"
-#include "util/Math.h"
+#include "Item.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/items/Item.cc
===================================================================
--- branches/pch/src/orxonox/objects/items/Item.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/items/Item.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -27,7 +27,6 @@
*/
#include "Item.h"
-
#include "core/CoreIncludes.h"
namespace orxonox
@@ -36,8 +35,4 @@
{
RegisterObject(Item);
}
-
- Item::~Item()
- {
- }
}
Modified: branches/pch/src/orxonox/objects/items/Item.h
===================================================================
--- branches/pch/src/orxonox/objects/items/Item.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/items/Item.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -40,7 +40,7 @@
{
public:
Item(BaseObject* creator);
- virtual ~Item();
+ virtual ~Item() {}
};
}
Modified: branches/pch/src/orxonox/objects/items/MultiStateEngine.cc
===================================================================
--- branches/pch/src/orxonox/objects/items/MultiStateEngine.cc 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/items/MultiStateEngine.cc 2009-06-15 18:20:14 UTC (rev 3179)
@@ -28,8 +28,8 @@
#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"
Modified: branches/pch/src/orxonox/objects/items/MultiStateEngine.h
===================================================================
--- branches/pch/src/orxonox/objects/items/MultiStateEngine.h 2009-06-15 11:43:16 UTC (rev 3178)
+++ branches/pch/src/orxonox/objects/items/MultiStateEngine.h 2009-06-15 18:20:14 UTC (rev 3179)
@@ -31,6 +31,7 @@
#include "OrxonoxPrereqs.h"
+#include <list>
#include "Engine.h"
namespace orxonox
More information about the Orxonox-commit
mailing list