[Orxonox-commit 4117] r8788 - in code/branches/output/src: . libraries/core libraries/core/command libraries/core/input libraries/network libraries/network/packet libraries/util modules/weapons modules/weapons/projectiles orxonox/gamestates
landauf at orxonox.net
landauf at orxonox.net
Tue Jul 26 00:05:24 CEST 2011
Author: landauf
Date: 2011-07-26 00:05:23 +0200 (Tue, 26 Jul 2011)
New Revision: 8788
Modified:
code/branches/output/src/Orxonox.cc
code/branches/output/src/libraries/core/ClassFactory.h
code/branches/output/src/libraries/core/CommandLineParser.cc
code/branches/output/src/libraries/core/Core.cc
code/branches/output/src/libraries/core/CoreIncludes.h
code/branches/output/src/libraries/core/CorePrecompiledHeaders.h
code/branches/output/src/libraries/core/GUIManager.cc
code/branches/output/src/libraries/core/Game.cc
code/branches/output/src/libraries/core/Game.h
code/branches/output/src/libraries/core/GameState.cc
code/branches/output/src/libraries/core/Identifier.h
code/branches/output/src/libraries/core/Language.cc
code/branches/output/src/libraries/core/Loader.cc
code/branches/output/src/libraries/core/LuaState.cc
code/branches/output/src/libraries/core/MetaObjectList.cc
code/branches/output/src/libraries/core/NamespaceNode.cc
code/branches/output/src/libraries/core/PathConfig.cc
code/branches/output/src/libraries/core/SubclassIdentifier.h
code/branches/output/src/libraries/core/Super.h
code/branches/output/src/libraries/core/Template.cc
code/branches/output/src/libraries/core/XMLPort.h
code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.cc
code/branches/output/src/libraries/core/command/Executor.cc
code/branches/output/src/libraries/core/command/Functor.h
code/branches/output/src/libraries/core/command/TclBind.cc
code/branches/output/src/libraries/core/input/Button.cc
code/branches/output/src/libraries/core/input/InputDevice.h
code/branches/output/src/libraries/core/input/KeyBinder.cc
code/branches/output/src/libraries/core/input/KeyBinderManager.cc
code/branches/output/src/libraries/network/Client.cc
code/branches/output/src/libraries/network/ClientConnection.cc
code/branches/output/src/libraries/network/GamestateManager.cc
code/branches/output/src/libraries/network/LANDiscoverable.cc
code/branches/output/src/libraries/network/MasterServerComm.cc
code/branches/output/src/libraries/network/NetworkPrecompiledHeaders.h
code/branches/output/src/libraries/network/Server.cc
code/branches/output/src/libraries/network/ServerConnection.cc
code/branches/output/src/libraries/network/packet/Acknowledgement.cc
code/branches/output/src/libraries/network/packet/DeleteObjects.cc
code/branches/output/src/libraries/network/packet/FunctionIDs.cc
code/branches/output/src/libraries/network/packet/Gamestate.cc
code/branches/output/src/libraries/network/packet/Packet.cc
code/branches/output/src/libraries/network/packet/Welcome.cc
code/branches/output/src/libraries/util/Clipboard.cc
code/branches/output/src/libraries/util/Convert.h
code/branches/output/src/libraries/util/Exception.cc
code/branches/output/src/libraries/util/Exception.h
code/branches/output/src/libraries/util/OrxAssert.h
code/branches/output/src/libraries/util/Scope.h
code/branches/output/src/libraries/util/SignalHandler.cc
code/branches/output/src/libraries/util/Sleep.cc
code/branches/output/src/libraries/util/SubString.cc
code/branches/output/src/modules/weapons/RocketController.cc
code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc
code/branches/output/src/orxonox/gamestates/GSClient.cc
code/branches/output/src/orxonox/gamestates/GSMasterServer.cc
code/branches/output/src/orxonox/gamestates/GSServer.cc
Log:
changed includes from Debug.h to Output.h
doesn't compile.
Modified: code/branches/output/src/Orxonox.cc
===================================================================
--- code/branches/output/src/Orxonox.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/Orxonox.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -42,7 +42,7 @@
#include <windows.h>
#endif
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "orxonox/Main.h"
Modified: code/branches/output/src/libraries/core/ClassFactory.h
===================================================================
--- code/branches/output/src/libraries/core/ClassFactory.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/ClassFactory.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -41,7 +41,7 @@
#include <string>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "Identifier.h"
namespace orxonox
Modified: code/branches/output/src/libraries/core/CommandLineParser.cc
===================================================================
--- code/branches/output/src/libraries/core/CommandLineParser.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/CommandLineParser.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -32,7 +32,7 @@
#include <sstream>
#include "util/Convert.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "util/StringUtils.h"
#include "util/SubString.h"
Modified: code/branches/output/src/libraries/core/Core.cc
===================================================================
--- code/branches/output/src/libraries/core/Core.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/Core.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -51,7 +51,7 @@
#endif
#include "util/Clock.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "util/Scope.h"
#include "util/ScopedSingletonManager.h"
Modified: code/branches/output/src/libraries/core/CoreIncludes.h
===================================================================
--- code/branches/output/src/libraries/core/CoreIncludes.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/CoreIncludes.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -77,7 +77,7 @@
#include "CorePrereqs.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "Identifier.h"
#include "ClassFactory.h"
#include "ObjectList.h"
Modified: code/branches/output/src/libraries/core/CorePrecompiledHeaders.h
===================================================================
--- code/branches/output/src/libraries/core/CorePrecompiledHeaders.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/CorePrecompiledHeaders.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -50,7 +50,7 @@
#include <sstream> // 53
#include <set> // 50
-#include "util/Debug.h" // 48
+#include "util/Output.h" // 48
#include <deque> // 43
#include <list> // 44
Modified: code/branches/output/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/output/src/libraries/core/GUIManager.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/GUIManager.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -72,7 +72,7 @@
#include "util/Clock.h"
#include "util/Convert.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "util/Math.h"
#include "util/OrxAssert.h"
Modified: code/branches/output/src/libraries/core/Game.cc
===================================================================
--- code/branches/output/src/libraries/core/Game.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/Game.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -39,7 +39,7 @@
#include <loki/ScopeGuard.h>
#include "util/Clock.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "util/Sleep.h"
#include "util/SubString.h"
Modified: code/branches/output/src/libraries/core/Game.h
===================================================================
--- code/branches/output/src/libraries/core/Game.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/Game.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -46,7 +46,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/preprocessor/cat.hpp>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/DestructionHelper.h"
#include "util/Singleton.h"
#include "OrxonoxClass.h"
Modified: code/branches/output/src/libraries/core/GameState.cc
===================================================================
--- code/branches/output/src/libraries/core/GameState.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/GameState.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -34,7 +34,6 @@
#include "GameState.h"
-#include "util/Debug.h"
#include "util/Exception.h"
#include "util/OrxAssert.h"
#include "Game.h"
Modified: code/branches/output/src/libraries/core/Identifier.h
===================================================================
--- code/branches/output/src/libraries/core/Identifier.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/Identifier.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -88,7 +88,7 @@
#include <typeinfo>
#include <loki/TypeTraits.h>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "MetaObjectList.h"
#include "ObjectList.h"
#include "ObjectListBase.h"
Modified: code/branches/output/src/libraries/core/Language.cc
===================================================================
--- code/branches/output/src/libraries/core/Language.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/Language.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -34,7 +34,7 @@
#include "Language.h"
#include <fstream>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/StringUtils.h"
#include "Core.h"
#include "PathConfig.h"
Modified: code/branches/output/src/libraries/core/Loader.cc
===================================================================
--- code/branches/output/src/libraries/core/Loader.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/Loader.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -32,7 +32,7 @@
#include <tinyxml/ticpp.h>
#include <boost/scoped_ptr.hpp>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "util/StringUtils.h"
#include "BaseObject.h"
Modified: code/branches/output/src/libraries/core/LuaState.cc
===================================================================
--- code/branches/output/src/libraries/core/LuaState.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/LuaState.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -36,7 +36,7 @@
}
#include <loki/ScopeGuard.h>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "Resource.h"
#include "command/IOConsole.h"
Modified: code/branches/output/src/libraries/core/MetaObjectList.cc
===================================================================
--- code/branches/output/src/libraries/core/MetaObjectList.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/MetaObjectList.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -33,7 +33,7 @@
#include "MetaObjectList.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "Identifier.h"
#include "ObjectListBase.h"
Modified: code/branches/output/src/libraries/core/NamespaceNode.cc
===================================================================
--- code/branches/output/src/libraries/core/NamespaceNode.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/NamespaceNode.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -27,7 +27,7 @@
*/
#include "NamespaceNode.h"
-#include "util/Debug.h"
+#include "util/Output.h"
namespace orxonox
{
Modified: code/branches/output/src/libraries/core/PathConfig.cc
===================================================================
--- code/branches/output/src/libraries/core/PathConfig.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/PathConfig.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -50,7 +50,7 @@
#endif
#include "SpecialConfig.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "CommandLineParser.h"
Modified: code/branches/output/src/libraries/core/SubclassIdentifier.h
===================================================================
--- code/branches/output/src/libraries/core/SubclassIdentifier.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/SubclassIdentifier.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -68,7 +68,7 @@
#include "CorePrereqs.h"
#include <cstdlib>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "Identifier.h"
namespace orxonox
Modified: code/branches/output/src/libraries/core/Super.h
===================================================================
--- code/branches/output/src/libraries/core/Super.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/Super.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -72,7 +72,7 @@
#define _Super_H__
#include "CorePrereqs.h"
-#include "util/Debug.h"
+#include "util/Output.h"
///////////////////////
// Macro definitions //
Modified: code/branches/output/src/libraries/core/Template.cc
===================================================================
--- code/branches/output/src/libraries/core/Template.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/Template.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -31,7 +31,7 @@
#include <tinyxml/tinyxml.h>
#include <tinyxml/ticpp.h>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "CoreIncludes.h"
#include "XMLPort.h"
Modified: code/branches/output/src/libraries/core/XMLPort.h
===================================================================
--- code/branches/output/src/libraries/core/XMLPort.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/XMLPort.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -52,7 +52,7 @@
#include <string>
#include <tinyxml/ticpp.h>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "util/MultiType.h"
#include "util/OrxAssert.h"
Modified: code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.cc
===================================================================
--- code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -37,7 +37,7 @@
#include <set>
#include <string>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/ExprParser.h"
#include "util/StringUtils.h"
#include "ConsoleCommand.h"
Modified: code/branches/output/src/libraries/core/command/Executor.cc
===================================================================
--- code/branches/output/src/libraries/core/command/Executor.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/command/Executor.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -37,7 +37,7 @@
#include <algorithm>
#include "util/Convert.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/StringUtils.h"
#include "util/SubString.h"
#include "CommandExecutor.h"
Modified: code/branches/output/src/libraries/core/command/Functor.h
===================================================================
--- code/branches/output/src/libraries/core/command/Functor.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/command/Functor.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -117,7 +117,7 @@
#include <typeinfo>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/MultiType.h"
#include "core/OrxonoxClass.h"
#include "FunctorPtr.h"
Modified: code/branches/output/src/libraries/core/command/TclBind.cc
===================================================================
--- code/branches/output/src/libraries/core/command/TclBind.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/command/TclBind.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -33,7 +33,7 @@
#include <cpptcl/cpptcl.h>
#include "SpecialConfig.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "util/StringUtils.h"
#include "core/PathConfig.h"
Modified: code/branches/output/src/libraries/core/input/Button.cc
===================================================================
--- code/branches/output/src/libraries/core/input/Button.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/input/Button.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -37,7 +37,7 @@
#include "util/Convert.h"
#include "util/SubString.h"
#include "util/StringUtils.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "core/command/ConsoleCommand.h"
#include "core/command/CommandEvaluation.h"
#include "core/command/CommandExecutor.h"
Modified: code/branches/output/src/libraries/core/input/InputDevice.h
===================================================================
--- code/branches/output/src/libraries/core/input/InputDevice.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/input/InputDevice.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -42,7 +42,7 @@
#include <ois/OISException.h>
#include "util/Clock.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "InputState.h"
Modified: code/branches/output/src/libraries/core/input/KeyBinder.cc
===================================================================
--- code/branches/output/src/libraries/core/input/KeyBinder.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/input/KeyBinder.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -31,7 +31,7 @@
#include <algorithm>
#include <sstream>
#include "util/Convert.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "core/ConfigValueIncludes.h"
#include "core/CoreIncludes.h"
Modified: code/branches/output/src/libraries/core/input/KeyBinderManager.cc
===================================================================
--- code/branches/output/src/libraries/core/input/KeyBinderManager.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/core/input/KeyBinderManager.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -28,7 +28,7 @@
#include "KeyBinderManager.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Exception.h"
#include "util/ScopedSingletonManager.h"
#include "core/ConfigValueIncludes.h"
Modified: code/branches/output/src/libraries/network/Client.cc
===================================================================
--- code/branches/output/src/libraries/network/Client.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/Client.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -43,7 +43,7 @@
#include <cassert>
#include "util/Clock.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/ScopedSingletonManager.h"
#include "synchronisable/Synchronisable.h"
#include "packet/Chat.h"
Modified: code/branches/output/src/libraries/network/ClientConnection.cc
===================================================================
--- code/branches/output/src/libraries/network/ClientConnection.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/ClientConnection.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -31,7 +31,7 @@
#include <cassert>
#define WIN32_LEAN_AND_MEAN
#include <enet/enet.h>
-#include "util/Debug.h"
+#include "util/Output.h"
namespace orxonox
{
Modified: code/branches/output/src/libraries/network/GamestateManager.cc
===================================================================
--- code/branches/output/src/libraries/network/GamestateManager.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/GamestateManager.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -51,7 +51,7 @@
#include "core/ThreadPool.h"
#include "core/command/Executor.h"
#include "core/GameMode.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/Clock.h"
#include "util/OrxAssert.h"
// #include "TrafficControl.h"
Modified: code/branches/output/src/libraries/network/LANDiscoverable.cc
===================================================================
--- code/branches/output/src/libraries/network/LANDiscoverable.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/LANDiscoverable.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -32,7 +32,7 @@
#include <cassert>
#include <cstring>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "packet/ServerInformation.h"
namespace orxonox
Modified: code/branches/output/src/libraries/network/MasterServerComm.cc
===================================================================
--- code/branches/output/src/libraries/network/MasterServerComm.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/MasterServerComm.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -27,7 +27,7 @@
*/
#include "MasterServerComm.h"
-#include "util/Debug.h"
+#include "util/Output.h"
namespace orxonox
{
Modified: code/branches/output/src/libraries/network/NetworkPrecompiledHeaders.h
===================================================================
--- code/branches/output/src/libraries/network/NetworkPrecompiledHeaders.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/NetworkPrecompiledHeaders.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -51,7 +51,7 @@
#include <sstream> // 22
#include <set> // 20
-#include "util/Debug.h" // 20
+#include "util/Output.h" // 20
#include <loki/TypeTraits.h> // 18
#ifdef ORXONOX_COMPILER_MSVC
Modified: code/branches/output/src/libraries/network/Server.cc
===================================================================
--- code/branches/output/src/libraries/network/Server.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/Server.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -46,7 +46,7 @@
#include <string>
#include "util/Clock.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "core/ObjectList.h"
#include "core/command/Executor.h"
#include "packet/Chat.h"
Modified: code/branches/output/src/libraries/network/ServerConnection.cc
===================================================================
--- code/branches/output/src/libraries/network/ServerConnection.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/ServerConnection.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -33,7 +33,7 @@
#define WIN32_LEAN_AND_MEAN
#include <enet/enet.h>
-#include "util/Debug.h"
+#include "util/Output.h"
#include <util/Sleep.h>
// #include "ClientInformation.h"
Modified: code/branches/output/src/libraries/network/packet/Acknowledgement.cc
===================================================================
--- code/branches/output/src/libraries/network/packet/Acknowledgement.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/packet/Acknowledgement.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -28,7 +28,7 @@
#include "Acknowledgement.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "network/GamestateHandler.h"
#include "network/Host.h"
Modified: code/branches/output/src/libraries/network/packet/DeleteObjects.cc
===================================================================
--- code/branches/output/src/libraries/network/packet/DeleteObjects.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/packet/DeleteObjects.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -30,7 +30,7 @@
#include "DeleteObjects.h"
#include <cassert>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "network/synchronisable/Synchronisable.h"
namespace orxonox {
Modified: code/branches/output/src/libraries/network/packet/FunctionIDs.cc
===================================================================
--- code/branches/output/src/libraries/network/packet/FunctionIDs.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/packet/FunctionIDs.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -33,7 +33,7 @@
#include <queue>
#include <string>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "core/ObjectList.h"
#include "network/NetworkFunction.h"
Modified: code/branches/output/src/libraries/network/packet/Gamestate.cc
===================================================================
--- code/branches/output/src/libraries/network/packet/Gamestate.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/packet/Gamestate.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -30,7 +30,7 @@
#include <zlib.h>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "util/OrxAssert.h"
#include "core/GameMode.h"
#include "core/ObjectList.h"
Modified: code/branches/output/src/libraries/network/packet/Packet.cc
===================================================================
--- code/branches/output/src/libraries/network/packet/Packet.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/packet/Packet.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -36,7 +36,7 @@
#include <boost/static_assert.hpp>
#include <boost/thread/mutex.hpp>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "Acknowledgement.h"
#include "Chat.h"
#include "ClassID.h"
Modified: code/branches/output/src/libraries/network/packet/Welcome.cc
===================================================================
--- code/branches/output/src/libraries/network/packet/Welcome.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/network/packet/Welcome.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -31,7 +31,7 @@
#include "Welcome.h"
#include <cassert>
-#include "util/Debug.h"
+#include "util/Output.h"
#include "network/Host.h"
#include "network/synchronisable/Synchronisable.h"
Modified: code/branches/output/src/libraries/util/Clipboard.cc
===================================================================
--- code/branches/output/src/libraries/util/Clipboard.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/util/Clipboard.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -47,7 +47,7 @@
#include <windows.h>
#undef min
#undef max
-#include "Debug.h"
+#include "Output.h"
namespace orxonox
{
Modified: code/branches/output/src/libraries/util/Convert.h
===================================================================
--- code/branches/output/src/libraries/util/Convert.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/util/Convert.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -129,7 +129,7 @@
#include <typeinfo>
#include <loki/TypeManip.h>
-#include "Debug.h"
+#include "Output.h"
#include "ImplicitConversion.h"
// disable warnings about possible loss of data
Modified: code/branches/output/src/libraries/util/Exception.cc
===================================================================
--- code/branches/output/src/libraries/util/Exception.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/util/Exception.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -36,7 +36,7 @@
#include <cstddef>
#include <CEGUIExceptions.h>
-#include "Debug.h"
+#include "Output.h"
namespace orxonox
{
Modified: code/branches/output/src/libraries/util/Exception.h
===================================================================
--- code/branches/output/src/libraries/util/Exception.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/util/Exception.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -62,7 +62,7 @@
#include <exception>
#include <sstream>
#include <string>
-#include "Debug.h"
+#include "Output.h"
namespace orxonox
{
Modified: code/branches/output/src/libraries/util/OrxAssert.h
===================================================================
--- code/branches/output/src/libraries/util/OrxAssert.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/util/OrxAssert.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -39,7 +39,7 @@
#include "UtilPrereqs.h"
#include <cassert>
-#include "Debug.h"
+#include "Output.h"
#ifndef NDEBUG
Modified: code/branches/output/src/libraries/util/Scope.h
===================================================================
--- code/branches/output/src/libraries/util/Scope.h 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/util/Scope.h 2011-07-25 22:05:23 UTC (rev 8788)
@@ -59,7 +59,7 @@
#include <set>
#include <loki/ScopeGuard.h>
-#include "Debug.h"
+#include "Output.h"
namespace orxonox
{
Modified: code/branches/output/src/libraries/util/SignalHandler.cc
===================================================================
--- code/branches/output/src/libraries/util/SignalHandler.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/util/SignalHandler.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -38,7 +38,7 @@
#include <cstring>
#include <cstdio>
-#include "Debug.h"
+#include "Output.h"
namespace orxonox
{
Modified: code/branches/output/src/libraries/util/Sleep.cc
===================================================================
--- code/branches/output/src/libraries/util/Sleep.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/util/Sleep.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -33,7 +33,7 @@
*/
#include "Sleep.h"
-#include "Debug.h"
+#include "Output.h"
#ifdef ORXONOX_PLATFORM_WINDOWS
#ifndef WIN32_LEAN_AND_MEAN
Modified: code/branches/output/src/libraries/util/SubString.cc
===================================================================
--- code/branches/output/src/libraries/util/SubString.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/libraries/util/SubString.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -44,7 +44,7 @@
#include "SubString.h"
#include <cstdio>
-#include "Debug.h"
+#include "Output.h"
namespace orxonox
{
Modified: code/branches/output/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/output/src/modules/weapons/RocketController.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/modules/weapons/RocketController.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -30,7 +30,7 @@
#include "projectiles/SimpleRocket.h"
#include "util/Math.h"
#include "weapons/projectiles/SimpleRocket.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "weapons/weaponmodes/SimpleRocketFire.h"
#include "worldentities/pawns/Pawn.h"
Modified: code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -40,7 +40,7 @@
#include "controllers/Controller.h"
#include "weapons/RocketController.h"
#include "sound/WorldSound.h"
-#include "util/Debug.h"
+#include "util/Output.h"
namespace orxonox
{
Modified: code/branches/output/src/orxonox/gamestates/GSClient.cc
===================================================================
--- code/branches/output/src/orxonox/gamestates/GSClient.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/orxonox/gamestates/GSClient.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -28,7 +28,6 @@
#include "GSClient.h"
-#include "util/Debug.h"
#include "util/Exception.h"
#include "core/CommandLineParser.h"
#include "core/Game.h"
Modified: code/branches/output/src/orxonox/gamestates/GSMasterServer.cc
===================================================================
--- code/branches/output/src/orxonox/gamestates/GSMasterServer.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/orxonox/gamestates/GSMasterServer.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -29,7 +29,7 @@
#include "GSMasterServer.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "core/Game.h"
#include "core/GameMode.h"
Modified: code/branches/output/src/orxonox/gamestates/GSServer.cc
===================================================================
--- code/branches/output/src/orxonox/gamestates/GSServer.cc 2011-07-25 21:53:17 UTC (rev 8787)
+++ code/branches/output/src/orxonox/gamestates/GSServer.cc 2011-07-25 22:05:23 UTC (rev 8788)
@@ -28,7 +28,7 @@
#include "GSServer.h"
-#include "util/Debug.h"
+#include "util/Output.h"
#include "core/CommandLineParser.h"
#include "core/Game.h"
#include "core/GameMode.h"
More information about the Orxonox-commit
mailing list