[Orxonox-commit 4910] r9579 - in code/branches/core6/src: libraries/network libraries/network/packet libraries/network/synchronisable modules/designtools modules/docking modules/objects modules/pong modules/towerdefense
landauf at orxonox.net
landauf at orxonox.net
Mon Mar 25 23:39:51 CET 2013
Author: landauf
Date: 2013-03-25 23:39:50 +0100 (Mon, 25 Mar 2013)
New Revision: 9579
Modified:
code/branches/core6/src/libraries/network/WANDiscoverable.h
code/branches/core6/src/libraries/network/WANDiscovery.h
code/branches/core6/src/libraries/network/packet/Gamestate.cc
code/branches/core6/src/libraries/network/synchronisable/Serialise.h
code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h
code/branches/core6/src/modules/designtools/ScreenshotManager.cc
code/branches/core6/src/modules/docking/Dock.h
code/branches/core6/src/modules/docking/DockingAnimation.cc
code/branches/core6/src/modules/docking/DockingAnimation.h
code/branches/core6/src/modules/docking/DockingController.cc
code/branches/core6/src/modules/docking/DockingEffect.cc
code/branches/core6/src/modules/docking/DockingEffect.h
code/branches/core6/src/modules/docking/DockingPrecompiledHeaders.h
code/branches/core6/src/modules/docking/DockingTarget.cc
code/branches/core6/src/modules/docking/MoveToDockingTarget.cc
code/branches/core6/src/modules/objects/SpaceBoundaries.h
code/branches/core6/src/modules/pong/PongAI.h
code/branches/core6/src/modules/towerdefense/TowerDefense.cc
Log:
cleaned up some includes
Modified: code/branches/core6/src/libraries/network/WANDiscoverable.h
===================================================================
--- code/branches/core6/src/libraries/network/WANDiscoverable.h 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/libraries/network/WANDiscoverable.h 2013-03-25 22:39:50 UTC (rev 9579)
@@ -30,7 +30,6 @@
#include "NetworkPrereqs.h"
#include "core/class/OrxonoxClass.h"
-#include "core/CoreIncludes.h"
#include "MasterServerComm.h"
namespace orxonox
Modified: code/branches/core6/src/libraries/network/WANDiscovery.h
===================================================================
--- code/branches/core6/src/libraries/network/WANDiscovery.h 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/libraries/network/WANDiscovery.h 2013-03-25 22:39:50 UTC (rev 9579)
@@ -30,7 +30,6 @@
#include "NetworkPrereqs.h"
#include "packet/ServerInformation.h"
-#include "core/CoreIncludes.h"
#include "core/config/Configurable.h"
#include "core/config/ConfigValueIncludes.h"
#include "MasterServerComm.h"
Modified: code/branches/core6/src/libraries/network/packet/Gamestate.cc
===================================================================
--- code/branches/core6/src/libraries/network/packet/Gamestate.cc 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/libraries/network/packet/Gamestate.cc 2013-03-25 22:39:50 UTC (rev 9579)
@@ -32,6 +32,7 @@
#include "util/Output.h"
#include "util/OrxAssert.h"
+#include "core/CoreIncludes.h"
#include "core/GameMode.h"
#include "core/object/ObjectList.h"
#include "network/synchronisable/Synchronisable.h"
Modified: code/branches/core6/src/libraries/network/synchronisable/Serialise.h
===================================================================
--- code/branches/core6/src/libraries/network/synchronisable/Serialise.h 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/libraries/network/synchronisable/Serialise.h 2013-03-25 22:39:50 UTC (rev 9579)
@@ -40,9 +40,6 @@
#include "util/Serialise.h"
#include "core/CorePrereqs.h"
-#include "core/CoreIncludes.h"
-#include "core/BaseObject.h" // remove this if circular dependencies in BaseObject/SmartPtr are fixed
-//#include "core/SmartPtr.h"
namespace orxonox{
Modified: code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h
===================================================================
--- code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h 2013-03-25 22:39:50 UTC (rev 9579)
@@ -39,6 +39,7 @@
#include <set>
#include "util/mbool.h"
+#include "util/Output.h"
#include "core/class/OrxonoxClass.h"
#include "SynchronisableVariable.h"
#include "NetworkCallback.h"
Modified: code/branches/core6/src/modules/designtools/ScreenshotManager.cc
===================================================================
--- code/branches/core6/src/modules/designtools/ScreenshotManager.cc 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/designtools/ScreenshotManager.cc 2013-03-25 22:39:50 UTC (rev 9579)
@@ -41,6 +41,7 @@
#include <OgreRoot.h>
#include <OgreViewport.h>
+#include "core/CoreIncludes.h"
#include "core/config/ConfigValueIncludes.h"
#include "core/GraphicsManager.h"
#include "core/PathConfig.h"
Modified: code/branches/core6/src/modules/docking/Dock.h
===================================================================
--- code/branches/core6/src/modules/docking/Dock.h 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/docking/Dock.h 2013-03-25 22:39:50 UTC (rev 9579)
@@ -39,7 +39,6 @@
#include <set>
-#include "core/CoreIncludes.h"
#include "core/EventIncludes.h"
#include "core/XMLPort.h"
Modified: code/branches/core6/src/modules/docking/DockingAnimation.cc
===================================================================
--- code/branches/core6/src/modules/docking/DockingAnimation.cc 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/docking/DockingAnimation.cc 2013-03-25 22:39:50 UTC (rev 9579)
@@ -34,6 +34,7 @@
#include "DockingAnimation.h"
#include "DockingEffect.h" // For DockingEffect::findTarget
+#include "core/CoreIncludes.h"
namespace orxonox
{
Modified: code/branches/core6/src/modules/docking/DockingAnimation.h
===================================================================
--- code/branches/core6/src/modules/docking/DockingAnimation.h 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/docking/DockingAnimation.h 2013-03-25 22:39:50 UTC (rev 9579)
@@ -35,7 +35,6 @@
#ifndef _DockingAnimation_H__
#define _DockingAnimation_H__
-#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "infos/PlayerInfo.h"
Modified: code/branches/core6/src/modules/docking/DockingController.cc
===================================================================
--- code/branches/core6/src/modules/docking/DockingController.cc 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/docking/DockingController.cc 2013-03-25 22:39:50 UTC (rev 9579)
@@ -33,6 +33,7 @@
#include "infos/PlayerInfo.h"
#include "worldentities/ControllableEntity.h"
#include "Dock.h"
+#include "core/CoreIncludes.h"
namespace orxonox
{
Modified: code/branches/core6/src/modules/docking/DockingEffect.cc
===================================================================
--- code/branches/core6/src/modules/docking/DockingEffect.cc 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/docking/DockingEffect.cc 2013-03-25 22:39:50 UTC (rev 9579)
@@ -32,6 +32,7 @@
*/
#include "DockingEffect.h"
+#include "core/CoreIncludes.h"
namespace orxonox
{
Modified: code/branches/core6/src/modules/docking/DockingEffect.h
===================================================================
--- code/branches/core6/src/modules/docking/DockingEffect.h 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/docking/DockingEffect.h 2013-03-25 22:39:50 UTC (rev 9579)
@@ -35,7 +35,6 @@
#ifndef _DockingEffect_H__
#define _DockingEffect_H__
-#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "infos/PlayerInfo.h"
Modified: code/branches/core6/src/modules/docking/DockingPrecompiledHeaders.h
===================================================================
--- code/branches/core6/src/modules/docking/DockingPrecompiledHeaders.h 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/docking/DockingPrecompiledHeaders.h 2013-03-25 22:39:50 UTC (rev 9579)
@@ -44,7 +44,6 @@
///////////////////////////////////////////
#include "core/BaseObject.h"
-#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
Modified: code/branches/core6/src/modules/docking/DockingTarget.cc
===================================================================
--- code/branches/core6/src/modules/docking/DockingTarget.cc 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/docking/DockingTarget.cc 2013-03-25 22:39:50 UTC (rev 9579)
@@ -32,6 +32,7 @@
*/
#include "DockingTarget.h"
+#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
Modified: code/branches/core6/src/modules/docking/MoveToDockingTarget.cc
===================================================================
--- code/branches/core6/src/modules/docking/MoveToDockingTarget.cc 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/docking/MoveToDockingTarget.cc 2013-03-25 22:39:50 UTC (rev 9579)
@@ -35,6 +35,7 @@
#include "MoveToDockingTarget.h"
#include "core/XMLPort.h"
+#include "core/CoreIncludes.h"
namespace orxonox
{
Modified: code/branches/core6/src/modules/objects/SpaceBoundaries.h
===================================================================
--- code/branches/core6/src/modules/objects/SpaceBoundaries.h 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/objects/SpaceBoundaries.h 2013-03-25 22:39:50 UTC (rev 9579)
@@ -35,7 +35,6 @@
#include <list>
#include <vector>
-#include "core/CoreIncludes.h"
#include "core/object/WeakPtr.h"
#include "tools/interfaces/Tickable.h"
Modified: code/branches/core6/src/modules/pong/PongAI.h
===================================================================
--- code/branches/core6/src/modules/pong/PongAI.h 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/pong/PongAI.h 2013-03-25 22:39:50 UTC (rev 9579)
@@ -43,6 +43,7 @@
#include "tools/interfaces/Tickable.h"
#include "controllers/Controller.h"
+#include "PongBall.h"
namespace orxonox
{
Modified: code/branches/core6/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/core6/src/modules/towerdefense/TowerDefense.cc 2013-03-25 22:05:13 UTC (rev 9578)
+++ code/branches/core6/src/modules/towerdefense/TowerDefense.cc 2013-03-25 22:39:50 UTC (rev 9579)
@@ -86,6 +86,7 @@
#include "infos/PlayerInfo.h"
#include "chat/ChatManager.h"
+#include "core/CoreIncludes.h"
/* Part of a temporary hack to allow the player to add towers */
#include "core/command/ConsoleCommand.h"
More information about the Orxonox-commit
mailing list