[Orxonox-commit 655] r3187 - in branches/pch/src: core core/input network network/packet orxonox/gamestates orxonox/objects orxonox/objects/controllers orxonox/objects/infos orxonox/objects/pickup orxonox/overlays orxonox/overlays/map
rgrieder at orxonox.net
rgrieder at orxonox.net
Tue Jun 16 14:26:20 CEST 2009
Author: rgrieder
Date: 2009-06-16 14:26:20 +0200 (Tue, 16 Jun 2009)
New Revision: 3187
Modified:
branches/pch/src/core/CoreIncludes.h
branches/pch/src/core/input/InputManager.cc
branches/pch/src/network/GamestateClient.cc
branches/pch/src/network/Server.cc
branches/pch/src/network/packet/Gamestate.cc
branches/pch/src/orxonox/gamestates/GSLevel.cc
branches/pch/src/orxonox/objects/EventListener.cc
branches/pch/src/orxonox/objects/EventTarget.cc
branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.cc
branches/pch/src/orxonox/objects/infos/GametypeInfo.cc
branches/pch/src/orxonox/objects/pickup/DroppedItem.cc
branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc
branches/pch/src/orxonox/overlays/OverlayGroup.cc
branches/pch/src/orxonox/overlays/map/Map.cc
Log:
Officially included ObjectList.h in CoreIncludes.h (it gets included by the Identifier anyway).
Modified: branches/pch/src/core/CoreIncludes.h
===================================================================
--- branches/pch/src/core/CoreIncludes.h 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/core/CoreIncludes.h 2009-06-16 12:26:20 UTC (rev 3187)
@@ -42,10 +42,11 @@
#include "CorePrereqs.h"
+#include "util/Debug.h"
#include "Identifier.h"
#include "Factory.h"
#include "ClassFactory.h"
-#include "util/Debug.h"
+#include "ObjectList.h"
/**
Modified: branches/pch/src/core/input/InputManager.cc
===================================================================
--- branches/pch/src/core/input/InputManager.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/core/input/InputManager.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -48,7 +48,6 @@
#include "core/ConfigValueIncludes.h"
#include "core/ConsoleCommand.h"
#include "core/CommandLine.h"
-#include "core/ObjectList.h"
#include "InputBuffer.h"
#include "KeyDetector.h"
Modified: branches/pch/src/network/GamestateClient.cc
===================================================================
--- branches/pch/src/network/GamestateClient.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/network/GamestateClient.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -33,7 +33,6 @@
#include "core/CoreIncludes.h"
#include "core/BaseObject.h"
-#include "core/ObjectList.h"
#include "synchronisable/Synchronisable.h"
#include "synchronisable/NetworkCallbackManager.h"
#include "packet/Acknowledgement.h"
Modified: branches/pch/src/network/Server.cc
===================================================================
--- branches/pch/src/network/Server.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/network/Server.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -53,7 +53,6 @@
#include "core/Clock.h"
#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
#include "packet/Chat.h"
#include "packet/Packet.h"
#include "packet/Welcome.h"
Modified: branches/pch/src/network/packet/Gamestate.cc
===================================================================
--- branches/pch/src/network/packet/Gamestate.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/network/packet/Gamestate.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -35,7 +35,6 @@
#include "../TrafficControl.h"
#include "core/GameMode.h"
#include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
Modified: branches/pch/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -41,7 +41,6 @@
#include "core/GameMode.h"
#include "core/Core.h"
#include "core/Loader.h"
-#include "core/ObjectList.h"
#include "core/XMLFile.h"
#include "interfaces/Tickable.h"
Modified: branches/pch/src/orxonox/objects/EventListener.cc
===================================================================
--- branches/pch/src/orxonox/objects/EventListener.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/orxonox/objects/EventListener.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -29,7 +29,6 @@
#include "EventListener.h"
#include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
#include "core/XMLPort.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/EventTarget.cc
===================================================================
--- branches/pch/src/orxonox/objects/EventTarget.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/orxonox/objects/EventTarget.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -27,9 +27,7 @@
*/
#include "EventTarget.h"
-
#include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -30,7 +30,6 @@
#include "util/Math.h"
#include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
#include "core/XMLPort.h"
#include "objects/worldentities/pawns/Pawn.h"
Modified: branches/pch/src/orxonox/objects/infos/GametypeInfo.cc
===================================================================
--- branches/pch/src/orxonox/objects/infos/GametypeInfo.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/orxonox/objects/infos/GametypeInfo.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -30,7 +30,6 @@
#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/pickup/DroppedItem.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/DroppedItem.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/orxonox/objects/pickup/DroppedItem.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -31,7 +31,6 @@
#include "util/Math.h"
#include "core/CoreIncludes.h"
#include "core/Executor.h"
-#include "core/ObjectList.h"
#include "BaseItem.h"
#include "objects/worldentities/Billboard.h"
#include "objects/worldentities/Model.h"
Modified: branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -36,7 +36,6 @@
#include "BaseItem.h"
#include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
#include "core/Template.h"
#include "core/XMLPort.h"
#include "gui/GUIManager.h" // HACK; see below
Modified: branches/pch/src/orxonox/overlays/OverlayGroup.cc
===================================================================
--- branches/pch/src/orxonox/overlays/OverlayGroup.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/orxonox/overlays/OverlayGroup.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -35,7 +35,6 @@
#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
#include "core/XMLPort.h"
#include "OrxonoxOverlay.h"
Modified: branches/pch/src/orxonox/overlays/map/Map.cc
===================================================================
--- branches/pch/src/orxonox/overlays/map/Map.cc 2009-06-16 12:25:05 UTC (rev 3186)
+++ branches/pch/src/orxonox/overlays/map/Map.cc 2009-06-16 12:26:20 UTC (rev 3187)
@@ -50,7 +50,6 @@
#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
#include "core/XMLPort.h"
#include "interfaces/RadarViewable.h"
#include "objects/Scene.h"
More information about the Orxonox-commit
mailing list