[Orxonox-commit 2497] r7204 - in code/branches/consolecommands3/src: libraries/core libraries/core/input libraries/network libraries/tools modules/designtools modules/objects/triggers modules/overlays modules/overlays/hud modules/pong modules/questsystem modules/weapons modules/weapons/projectiles modules/weapons/weaponmodes orxonox orxonox/controllers orxonox/gamestates orxonox/gametypes orxonox/graphics orxonox/overlays orxonox/sound orxonox/worldentities
landauf at orxonox.net
landauf at orxonox.net
Mon Aug 23 01:08:15 CEST 2010
Author: landauf
Date: 2010-08-23 01:08:14 +0200 (Mon, 23 Aug 2010)
New Revision: 7204
Modified:
code/branches/consolecommands3/src/libraries/core/BaseObject.cc
code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc
code/branches/consolecommands3/src/libraries/core/Core.cc
code/branches/consolecommands3/src/libraries/core/CorePrereqs.h
code/branches/consolecommands3/src/libraries/core/EventIncludes.h
code/branches/consolecommands3/src/libraries/core/GUIManager.cc
code/branches/consolecommands3/src/libraries/core/Game.cc
code/branches/consolecommands3/src/libraries/core/GraphicsManager.cc
code/branches/consolecommands3/src/libraries/core/Identifier.cc
code/branches/consolecommands3/src/libraries/core/LuaState.cc
code/branches/consolecommands3/src/libraries/core/Thread.cc
code/branches/consolecommands3/src/libraries/core/WeakPtr.h
code/branches/consolecommands3/src/libraries/core/XMLPort.h
code/branches/consolecommands3/src/libraries/core/input/Button.cc
code/branches/consolecommands3/src/libraries/core/input/HalfAxis.cc
code/branches/consolecommands3/src/libraries/core/input/InputCommands.h
code/branches/consolecommands3/src/libraries/core/input/InputManager.cc
code/branches/consolecommands3/src/libraries/core/input/InputState.cc
code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc
code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc
code/branches/consolecommands3/src/libraries/core/input/Mouse.cc
code/branches/consolecommands3/src/libraries/network/GamestateManager.cc
code/branches/consolecommands3/src/libraries/network/Host.cc
code/branches/consolecommands3/src/libraries/network/NetworkFunction.h
code/branches/consolecommands3/src/libraries/network/Server.cc
code/branches/consolecommands3/src/libraries/tools/Timer.cc
code/branches/consolecommands3/src/libraries/tools/Timer.h
code/branches/consolecommands3/src/modules/designtools/ScreenshotManager.cc
code/branches/consolecommands3/src/modules/designtools/SkyboxGenerator.cc
code/branches/consolecommands3/src/modules/objects/triggers/Trigger.cc
code/branches/consolecommands3/src/modules/overlays/OverlaysPrecompiledHeaders.h
code/branches/consolecommands3/src/modules/overlays/hud/ChatOverlay.cc
code/branches/consolecommands3/src/modules/overlays/hud/GametypeStatus.cc
code/branches/consolecommands3/src/modules/pong/Pong.cc
code/branches/consolecommands3/src/modules/questsystem/QuestManager.cc
code/branches/consolecommands3/src/modules/questsystem/QuestsystemPrecompiledHeaders.h
code/branches/consolecommands3/src/modules/weapons/MuzzleFlash.cc
code/branches/consolecommands3/src/modules/weapons/projectiles/Projectile.cc
code/branches/consolecommands3/src/modules/weapons/weaponmodes/EnergyDrink.cc
code/branches/consolecommands3/src/modules/weapons/weaponmodes/HsW01.cc
code/branches/consolecommands3/src/orxonox/ChatInputHandler.cc
code/branches/consolecommands3/src/orxonox/OrxonoxPrecompiledHeaders.h
code/branches/consolecommands3/src/orxonox/Radar.cc
code/branches/consolecommands3/src/orxonox/Test.cc
code/branches/consolecommands3/src/orxonox/controllers/AIController.cc
code/branches/consolecommands3/src/orxonox/controllers/ArtificialController.cc
code/branches/consolecommands3/src/orxonox/controllers/DroneController.cc
code/branches/consolecommands3/src/orxonox/controllers/HumanController.cc
code/branches/consolecommands3/src/orxonox/controllers/NewHumanController.cc
code/branches/consolecommands3/src/orxonox/gamestates/GSGraphics.cc
code/branches/consolecommands3/src/orxonox/gamestates/GSLevel.cc
code/branches/consolecommands3/src/orxonox/gamestates/GSMainMenu.cc
code/branches/consolecommands3/src/orxonox/gamestates/GSRoot.cc
code/branches/consolecommands3/src/orxonox/gametypes/Gametype.cc
code/branches/consolecommands3/src/orxonox/gametypes/TeamBaseMatch.cc
code/branches/consolecommands3/src/orxonox/graphics/ParticleSpawner.cc
code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.cc
code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.h
code/branches/consolecommands3/src/orxonox/overlays/OrxonoxOverlay.cc
code/branches/consolecommands3/src/orxonox/overlays/OverlayGroup.cc
code/branches/consolecommands3/src/orxonox/sound/WorldSound.cc
code/branches/consolecommands3/src/orxonox/worldentities/BigExplosion.cc
code/branches/consolecommands3/src/orxonox/worldentities/ExplosionChunk.cc
code/branches/consolecommands3/src/orxonox/worldentities/MovableEntity.cc
Log:
adjusted includes in all other files
Modified: code/branches/consolecommands3/src/libraries/core/BaseObject.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/BaseObject.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/BaseObject.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -38,12 +38,12 @@
#include "CoreIncludes.h"
#include "Event.h"
#include "EventIncludes.h"
-#include "Functor.h"
#include "Iterator.h"
#include "Template.h"
#include "XMLFile.h"
#include "XMLNameListener.h"
#include "XMLPort.h"
+#include "command/Functor.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -33,9 +33,9 @@
#include "util/Convert.h"
#include "util/Math.h"
#include "util/StringUtils.h"
-#include "ConsoleCommand.h"
#include "ConfigValueContainer.h"
#include "PathConfig.h"
+#include "command/ConsoleCommand.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/Core.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/Core.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/Core.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -53,7 +53,6 @@
#include "util/Scope.h"
#include "util/SignalHandler.h"
#include "PathConfig.h"
-#include "CommandExecutor.h"
#include "CommandLineParser.h"
#include "ConfigFileManager.h"
#include "ConfigValueIncludes.h"
@@ -64,11 +63,12 @@
#include "GUIManager.h"
#include "Identifier.h"
#include "Language.h"
-#include "IOConsole.h"
#include "LuaState.h"
#include "ScopedSingletonManager.h"
-#include "TclBind.h"
-#include "TclThreadManager.h"
+#include "command/CommandExecutor.h"
+#include "command/IOConsole.h"
+#include "command/TclBind.h"
+#include "command/TclThreadManager.h"
#include "input/InputManager.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/libraries/core/CorePrereqs.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/CorePrereqs.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/CorePrereqs.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -115,8 +115,6 @@
{
typedef std::string LanguageEntryLabel;
- class ArgumentCompleter;
- class ArgumentCompletionListElement;
class BaseObject;
template <class T>
class ClassFactory;
@@ -126,7 +124,6 @@
class ClassTreeMaskIterator;
class ClassTreeMaskNode;
class ClassTreeMaskObjectIterator;
- class CommandEvaluation;
class CommandLineParser;
class CommandLineArgument;
class ConfigFile;
@@ -136,21 +133,12 @@
class ConfigFileManager;
class ConfigFileSection;
class ConfigValueContainer;
- class ConsoleCommand;
class Core;
class DynLib;
class DynLibManager;
struct Event;
class EventState;
- class Executor;
- template <class T>
- class ExecutorMember;
- class ExecutorStatic;
class Factory;
- class Functor;
- template <class T>
- class FunctorMember;
- class FunctorStatic;
class Game;
class GameState;
struct GameStateInfo;
@@ -158,8 +146,6 @@
class GraphicsManager;
class GUIManager;
class Identifier;
- class IOConsole;
- class IRC;
template <class T>
class Iterator;
class Language;
@@ -184,17 +170,10 @@
class PathConfig;
struct ResourceInfo;
class SettingsConfigFile;
- class Shell;
- class ShellListener;
template <class T>
class SmartPtr;
template <class T>
class SubclassIdentifier;
- class TclBind;
- struct TclInterpreterBundle;
- template <class T>
- class TclThreadList;
- class TclThreadManager;
class Template;
class Thread;
class ThreadPool;
@@ -210,6 +189,29 @@
class XMLPortObjectContainer;
class XMLPortParamContainer;
+ // Command
+ class ArgumentCompleter;
+ class ArgumentCompletionListElement;
+ class CommandEvaluation;
+ class ConsoleCommand;
+ class Executor;
+ template <class T>
+ class ExecutorMember;
+ class ExecutorStatic;
+ class Functor;
+ template <class T>
+ class FunctorMember;
+ class FunctorStatic;
+ class IOConsole;
+ class IRC;
+ class Shell;
+ class ShellListener;
+ class TclBind;
+ struct TclInterpreterBundle;
+ template <class T>
+ class TclThreadList;
+ class TclThreadManager;
+
// Input
class BaseCommand;
class BufferedParamCommand;
@@ -235,8 +237,8 @@
class SimpleCommand;
}
-#include "FunctorPtr.h"
-#include "ExecutorPtr.h"
+#include "command/FunctorPtr.h"
+#include "command/ExecutorPtr.h"
// CppTcl
namespace Tcl
Modified: code/branches/consolecommands3/src/libraries/core/EventIncludes.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/EventIncludes.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/EventIncludes.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -30,8 +30,8 @@
#define _EventIncludes_H__
#include "CorePrereqs.h"
-#include "Executor.h"
#include "XMLPort.h"
+#include "command/Executor.h"
/**
@brief Defines a new event state (a state of the object which can be changed by events).
Modified: code/branches/consolecommands3/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/GUIManager.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/GUIManager.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -56,12 +56,12 @@
#include "util/Debug.h"
#include "util/Exception.h"
#include "util/OrxAssert.h"
-#include "ConsoleCommand.h"
#include "Core.h"
#include "GraphicsManager.h"
#include "LuaState.h"
#include "PathConfig.h"
#include "Resource.h"
+#include "command/ConsoleCommand.h"
#include "input/InputManager.h"
#include "input/InputState.h"
#include "input/KeyBinderManager.h"
Modified: code/branches/consolecommands3/src/libraries/core/Game.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/Game.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/Game.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -44,13 +44,13 @@
#include "util/Sleep.h"
#include "util/SubString.h"
#include "CommandLineParser.h"
-#include "ConsoleCommand.h"
#include "Core.h"
#include "CoreIncludes.h"
#include "ConfigValueIncludes.h"
#include "GameMode.h"
#include "GameState.h"
#include "GUIManager.h"
+#include "command/ConsoleCommand.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/GraphicsManager.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/GraphicsManager.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -51,7 +51,6 @@
#include "util/Exception.h"
#include "util/StringUtils.h"
#include "util/SubString.h"
-#include "ConsoleCommand.h"
#include "ConfigValueIncludes.h"
#include "CoreIncludes.h"
#include "Game.h"
@@ -61,6 +60,7 @@
#include "PathConfig.h"
#include "WindowEventListener.h"
#include "XMLFile.h"
+#include "command/ConsoleCommand.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/Identifier.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/Identifier.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/Identifier.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -37,9 +37,9 @@
#include "util/StringUtils.h"
#include "ConfigValueContainer.h"
-#include "ConsoleCommand.h"
#include "ClassFactory.h"
#include "XMLPort.h"
+#include "command/ConsoleCommand.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/LuaState.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/LuaState.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/LuaState.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -38,9 +38,9 @@
#include "util/Debug.h"
#include "util/Exception.h"
#include "util/ScopeGuard.h"
-#include "IOConsole.h"
#include "Resource.h"
#include "ToluaBindCore.h"
+#include "command/IOConsole.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/Thread.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/Thread.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/Thread.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -35,7 +35,7 @@
#include <boost/thread/thread_time.hpp>
#include "util/Sleep.h"
-#include "Executor.h"
+#include "command/Executor.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/WeakPtr.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/WeakPtr.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/WeakPtr.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -35,7 +35,7 @@
#include <cassert>
#include "OrxonoxClass.h"
-#include "Functor.h"
+#include "command/Functor.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/XMLPort.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/XMLPort.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/XMLPort.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -52,8 +52,8 @@
#include "util/OrxAssert.h"
#include "util/StringUtils.h"
#include "Identifier.h"
-#include "Executor.h"
#include "BaseObject.h"
+#include "command/Executor.h"
// ------------
// XMLPortParam
Modified: code/branches/consolecommands3/src/libraries/core/input/Button.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/Button.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/Button.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -38,9 +38,9 @@
#include "util/SubString.h"
#include "util/StringUtils.h"
#include "util/Debug.h"
-#include "core/ConsoleCommand.h"
-#include "core/CommandEvaluation.h"
-#include "core/CommandExecutor.h"
+#include "core/command/ConsoleCommand.h"
+#include "core/command/CommandEvaluation.h"
+#include "core/command/CommandExecutor.h"
#include "core/ConfigFileManager.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/libraries/core/input/HalfAxis.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/HalfAxis.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/HalfAxis.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -33,7 +33,7 @@
*/
#include "HalfAxis.h"
-#include "core/CommandEvaluation.h"
+#include "core/command/CommandEvaluation.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/input/InputCommands.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/InputCommands.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/InputCommands.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -36,7 +36,7 @@
#define _InputCommands_H__
#include "InputPrereqs.h"
-#include "core/CommandEvaluation.h"
+#include "core/command/CommandEvaluation.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/input/InputManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/InputManager.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/InputManager.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -46,10 +46,10 @@
#include "util/ScopeGuard.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
-#include "core/ConsoleCommand.h"
#include "core/CommandLineParser.h"
-#include "core/Functor.h"
#include "core/GraphicsManager.h"
+#include "core/command/ConsoleCommand.h"
+#include "core/command/Functor.h"
#include "InputBuffer.h"
#include "JoyStick.h"
Modified: code/branches/consolecommands3/src/libraries/core/input/InputState.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/InputState.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/InputState.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -27,7 +27,7 @@
*/
#include "InputState.h"
-#include "core/Functor.h"
+#include "core/command/Functor.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -31,10 +31,10 @@
#include "util/Debug.h"
#include "util/Exception.h"
#include "core/ConfigValueIncludes.h"
-#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
#include "core/LuaState.h"
#include "core/ScopedSingletonManager.h"
+#include "core/command/ConsoleCommand.h"
#include "InputManager.h"
#include "KeyDetector.h"
Modified: code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -28,9 +28,9 @@
#include "KeyDetector.h"
-#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
#include "core/ScopedSingletonManager.h"
+#include "core/command/ConsoleCommand.h"
#include "Button.h"
#include "InputManager.h"
#include "InputState.h"
Modified: code/branches/consolecommands3/src/libraries/core/input/Mouse.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/Mouse.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/Mouse.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -29,8 +29,8 @@
#include "Mouse.h"
#include <ois/OISMouse.h>
-#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommand.h"
#include "InputState.h"
#ifdef ORXONOX_PLATFORM_LINUX
Modified: code/branches/consolecommands3/src/libraries/network/GamestateManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/network/GamestateManager.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/network/GamestateManager.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -46,8 +46,8 @@
// #include <boost/thread/mutex.hpp>
#include "util/Debug.h"
-#include "core/Executor.h"
#include "core/ThreadPool.h"
+#include "core/command/Executor.h"
#include "ClientInformation.h"
#include "packet/Acknowledgement.h"
#include "packet/Gamestate.h"
Modified: code/branches/consolecommands3/src/libraries/network/Host.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/network/Host.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/network/Host.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -31,8 +31,8 @@
#include <cassert>
#include <string>
-#include "core/ConsoleCommand.h"
#include "core/ObjectList.h"
+#include "core/command/ConsoleCommand.h"
#include "ChatListener.h"
namespace orxonox {
Modified: code/branches/consolecommands3/src/libraries/network/NetworkFunction.h
===================================================================
--- code/branches/consolecommands3/src/libraries/network/NetworkFunction.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/network/NetworkFunction.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -38,8 +38,8 @@
#include <boost/preprocessor/cat.hpp>
#include <boost/static_assert.hpp>
-#include "core/Functor.h"
#include "core/Identifier.h"
+#include "core/command/Functor.h"
#include "FunctionCallManager.h"
#include "synchronisable/Synchronisable.h"
Modified: code/branches/consolecommands3/src/libraries/network/Server.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/network/Server.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/network/Server.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -48,7 +48,7 @@
#include "util/Clock.h"
#include "util/Debug.h"
#include "core/ObjectList.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
#include "packet/Chat.h"
#include "packet/ClassID.h"
#include "packet/DeleteObjects.h"
Modified: code/branches/consolecommands3/src/libraries/tools/Timer.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/tools/Timer.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/tools/Timer.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -32,9 +32,9 @@
#include "util/Clock.h"
#include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
-#include "core/CommandExecutor.h"
-#include "core/Functor.h"
+#include "core/command/ConsoleCommand.h"
+#include "core/command/CommandExecutor.h"
+#include "core/command/Functor.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/tools/Timer.h
===================================================================
--- code/branches/consolecommands3/src/libraries/tools/Timer.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/libraries/tools/Timer.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -43,7 +43,7 @@
};
source.cc:
- include "core/Executor.h"
+ #include "core/command/Executor.h"
ClassName::ClassName()
{
@@ -62,8 +62,8 @@
#include "tools/ToolsPrereqs.h"
-#include "core/Executor.h"
#include "core/OrxonoxClass.h"
+#include "core/command/Executor.h"
#include "tools/interfaces/TimeFactorListener.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/modules/designtools/ScreenshotManager.cc
===================================================================
--- code/branches/consolecommands3/src/modules/designtools/ScreenshotManager.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/designtools/ScreenshotManager.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -11,7 +11,7 @@
#include "core/GraphicsManager.h"
#include "core/PathConfig.h"
#include "core/ScopedSingletonManager.h"
-#include "core/ConsoleCommand.h"
+#include "core/command/ConsoleCommand.h"
#include "CameraManager.h"
#include "graphics/Camera.h"
Modified: code/branches/consolecommands3/src/modules/designtools/SkyboxGenerator.cc
===================================================================
--- code/branches/consolecommands3/src/modules/designtools/SkyboxGenerator.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/designtools/SkyboxGenerator.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -33,15 +33,15 @@
#include <OgreRenderWindow.h>
#include <OgreCamera.h>
-#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
+#include "core/GraphicsManager.h"
#include "core/ScopedSingletonManager.h"
+#include "core/command/ConsoleCommand.h"
+#include "core/command/CommandExecutor.h"
#include "controllers/HumanController.h"
#include "worldentities/CameraPosition.h"
#include "worldentities/ControllableEntity.h"
-#include "core/GraphicsManager.h"
-#include "core/CommandExecutor.h"
#include "graphics/Camera.h"
Modified: code/branches/consolecommands3/src/modules/objects/triggers/Trigger.cc
===================================================================
--- code/branches/consolecommands3/src/modules/objects/triggers/Trigger.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/objects/triggers/Trigger.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -29,9 +29,9 @@
#include "Trigger.h"
#include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
#include "core/GameMode.h"
#include "core/XMLPort.h"
+#include "core/command/ConsoleCommand.h"
#include "Scene.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/modules/overlays/OverlaysPrecompiledHeaders.h
===================================================================
--- code/branches/consolecommands3/src/modules/overlays/OverlaysPrecompiledHeaders.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/overlays/OverlaysPrecompiledHeaders.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -57,7 +57,7 @@
///// Not so Stable Headers /////
///////////////////////////////////////////
-#include "core/Executor.h" // 13
+#include "core/command/Executor.h" // 13
//#include "network/synchronisable/Synchronisable.h" // 13
//#include "core/XMLPort.h" // 9
Modified: code/branches/consolecommands3/src/modules/overlays/hud/ChatOverlay.cc
===================================================================
--- code/branches/consolecommands3/src/modules/overlays/hud/ChatOverlay.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/overlays/hud/ChatOverlay.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -35,7 +35,7 @@
#include "util/DisplayStringConversions.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
#include "tools/Timer.h"
#include "infos/PlayerInfo.h"
Modified: code/branches/consolecommands3/src/modules/overlays/hud/GametypeStatus.cc
===================================================================
--- code/branches/consolecommands3/src/modules/overlays/hud/GametypeStatus.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/overlays/hud/GametypeStatus.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -29,8 +29,8 @@
#include "GametypeStatus.h"
#include "util/Convert.h"
-#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommand.h"
#include "infos/GametypeInfo.h"
#include "infos/PlayerInfo.h"
#include "worldentities/ControllableEntity.h"
Modified: code/branches/consolecommands3/src/modules/pong/Pong.cc
===================================================================
--- code/branches/consolecommands3/src/modules/pong/Pong.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/pong/Pong.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -30,7 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/EventIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
#include "PongCenterpoint.h"
#include "PongBall.h"
#include "PongBat.h"
Modified: code/branches/consolecommands3/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/branches/consolecommands3/src/modules/questsystem/QuestManager.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/questsystem/QuestManager.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -38,9 +38,9 @@
#include "util/Exception.h"
#include "core/CoreIncludes.h"
#include "core/GUIManager.h"
-#include "core/ConsoleCommand.h"
#include "core/LuaState.h"
#include "core/ScopedSingletonManager.h"
+#include "core/command/ConsoleCommand.h"
#include "infos/PlayerInfo.h"
#include "overlays/GUIOverlay.h"
Modified: code/branches/consolecommands3/src/modules/questsystem/QuestsystemPrecompiledHeaders.h
===================================================================
--- code/branches/consolecommands3/src/modules/questsystem/QuestsystemPrecompiledHeaders.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/questsystem/QuestsystemPrecompiledHeaders.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -64,7 +64,7 @@
///// Not so Stable Headers /////
///////////////////////////////////////////
-#include "core/Executor.h" // 15
+#include "core/command/Executor.h" // 15
//#include "core/XMLPort.h" // 14
Modified: code/branches/consolecommands3/src/modules/weapons/MuzzleFlash.cc
===================================================================
--- code/branches/consolecommands3/src/modules/weapons/MuzzleFlash.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/weapons/MuzzleFlash.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -30,7 +30,7 @@
#include "MuzzleFlash.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/modules/weapons/projectiles/Projectile.cc
===================================================================
--- code/branches/consolecommands3/src/modules/weapons/projectiles/Projectile.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/weapons/projectiles/Projectile.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -30,8 +30,8 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
-#include "core/Executor.h"
#include "core/GameMode.h"
+#include "core/command/Executor.h"
#include "objects/collisionshapes/SphereCollisionShape.h"
#include "worldentities/pawns/Pawn.h"
#include "graphics/ParticleSpawner.h"
Modified: code/branches/consolecommands3/src/modules/weapons/weaponmodes/EnergyDrink.cc
===================================================================
--- code/branches/consolecommands3/src/modules/weapons/weaponmodes/EnergyDrink.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/weapons/weaponmodes/EnergyDrink.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -29,8 +29,8 @@
#include "EnergyDrink.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
#include "core/XMLPort.h"
+#include "core/command/Executor.h"
#include "graphics/Model.h"
#include "weapons/projectiles/Projectile.h"
Modified: code/branches/consolecommands3/src/modules/weapons/weaponmodes/HsW01.cc
===================================================================
--- code/branches/consolecommands3/src/modules/weapons/weaponmodes/HsW01.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/modules/weapons/weaponmodes/HsW01.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -29,8 +29,8 @@
#include "HsW01.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
#include "core/XMLPort.h"
+#include "core/command/Executor.h"
#include "graphics/Model.h"
#include "weapons/projectiles/Projectile.h"
Modified: code/branches/consolecommands3/src/orxonox/ChatInputHandler.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/ChatInputHandler.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/ChatInputHandler.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -28,10 +28,10 @@
#include "ChatInputHandler.h"
#include <core/ScopedSingletonManager.h>
-#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
#include "core/GUIManager.h"
#include "core/CorePrereqs.h"
+#include "core/command/ConsoleCommand.h"
#include <CEGUIWindow.h>
#include <elements/CEGUIListbox.h>
#include <elements/CEGUIListboxItem.h>
Modified: code/branches/consolecommands3/src/orxonox/OrxonoxPrecompiledHeaders.h
===================================================================
--- code/branches/consolecommands3/src/orxonox/OrxonoxPrecompiledHeaders.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/OrxonoxPrecompiledHeaders.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -88,7 +88,7 @@
#include "network/synchronisable/Synchronisable.h" // 70
#include "util/MultiType.h" // 65
-#include "core/Executor.h" // 55
+#include "core/command/Executor.h" // 55
//#include "core/XMLPort.h" // 41
Modified: code/branches/consolecommands3/src/orxonox/Radar.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/Radar.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/Radar.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -36,8 +36,8 @@
#include <cassert>
//#include "util/Math.h"
-#include "core/ConsoleCommand.h"
#include "core/ObjectList.h"
+#include "core/command/ConsoleCommand.h"
#include "interfaces/RadarListener.h"
#include "controllers/HumanController.h"
#include "worldentities/pawns/Pawn.h"
Modified: code/branches/consolecommands3/src/orxonox/Test.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/Test.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/Test.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -28,7 +28,7 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
-#include "core/ConsoleCommand.h"
+#include "core/command/ConsoleCommand.h"
#include "network/NetworkFunction.h"
#include "Test.h"
#include "util/MultiType.h"
@@ -36,23 +36,23 @@
namespace orxonox
{
CreateFactory ( Test );
-
+
SetConsoleCommand(Test, printV1, true).accessLevel(AccessLevel::User);
SetConsoleCommand(Test, printV2, true).accessLevel(AccessLevel::User);
SetConsoleCommand(Test, printV3, true).accessLevel(AccessLevel::User);
SetConsoleCommand(Test, printV4, true).accessLevel(AccessLevel::User);
SetConsoleCommand(Test, call, true).accessLevel(AccessLevel::User);
SetConsoleCommand(Test, call2, true).accessLevel(AccessLevel::User);
-
-
+
+
//void=* aaaaa = copyPtr<sizeof(&Test::printV1)>( &NETWORK_FUNCTION_POINTER, &Test::printV1 );
//void* NETWORK_FUNCTION_TEST_B = memcpy(&NETWORK_FUNCTION_POINTER, &a, sizeof(a));
// NetworkFunctionBase* NETWORK_FUNCTION_TEST_C = new NetworkFunctionStatic( createFunctor(&Test::printV1), "bla", NETWORK_FUNCTION_POINTER );
-
+
registerStaticNetworkFunction( &Test::printV1 );
registerMemberNetworkFunction( Test, checkU1 );
registerMemberNetworkFunction( Test, printBlaBla );
-
+
Test* Test::instance_ = 0;
Test::Test(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
@@ -77,7 +77,7 @@
SetConfigValue ( u2, 2 )/*.callback ( this, &Test::checkV2 )*/;
SetConfigValue ( u3, 3 )/*.callback ( this, &Test::checkV3 )*/;
SetConfigValue ( u4, 4 )/*.callback ( this, &Test::checkV4 )*/;
-
+
SetConfigValue ( s1, 1 )/*.callback ( this, &Test::checkV1 )*/;
SetConfigValue ( s2, 2 )/*.callback ( this, &Test::checkV2 )*/;
SetConfigValue ( s3, 3 )/*.callback ( this, &Test::checkV3 )*/;
@@ -88,31 +88,31 @@
void Test::registerVariables()
{
registerVariable ( this->mySet_, VariableDirection::ToClient );
-
+
// registerVariable ( u1, VariableDirection::ToClient, new NetworkCallback<Test> ( this, &Test::checkU1 ));
// registerVariable ( u2, VariableDirection::ToServer, new NetworkCallback<Test> ( this, &Test::checkU2 ));
// registerVariable ( u3, Bidirectionality::ServerMaster, new NetworkCallback<Test> ( this, &Test::checkU3 ), true );
// registerVariable ( u4, Bidirectionality::ClientMaster, new NetworkCallback<Test> ( this, &Test::checkU4 ), true );
-
+
// registerVariable ( s1, VariableDirection::ToClient, new NetworkCallback<Test> ( this, &Test::checkS1 ));
// registerVariable ( s2, VariableDirection::ToServer, new NetworkCallback<Test> ( this, &Test::checkS2 ));
// registerVariable ( s3, Bidirectionality::ServerMaster, new NetworkCallback<Test> ( this, &Test::checkS3 ), true );
// registerVariable ( s4, Bidirectionality::ClientMaster, new NetworkCallback<Test> ( this, &Test::checkS4 ), true );
-
+
// registerVariable ( pointer_, VariableDirection::ToClient, new NetworkCallback<Test> ( this, &Test::printPointer ) );
}
-
+
void Test::call(unsigned int clientID)
{
callStaticNetworkFunction( &Test::printV1, clientID );
callStaticNetworkFunction( &Test::printV1, clientID );
}
-
+
void Test::call2(unsigned int clientID, std::string s1, std::string s2, std::string s3, std::string s4)
{
callMemberNetworkFunction( Test, printBlaBla, this->getObjectID(), clientID, s1, s2, s3, s4, s4 );
}
-
+
void Test::tick(float dt)
{
// std::string str1 = "blub";
@@ -131,12 +131,12 @@
// call2(0, "bal", "a", "n", "ce");
// callMemberNetworkFunction( Test, checkU1, this->getObjectID(), 0 );
}
-
+
void Test::printBlaBla(std::string s1, std::string s2, std::string s3, std::string s4, std::string s5)
{
COUT(0) << s1 << s2 << s3 << s4 << s5 << endl;
}
-
+
void Test::checkU1(){ COUT(1) << "U1 changed: " << u1 << std::endl; }
void Test::checkU2(){ COUT(1) << "U2 changed: " << u2 << std::endl; }
void Test::checkU3(){ COUT(1) << "U3 changed: " << u3 << std::endl; }
@@ -146,7 +146,7 @@
void Test::checkS2(){ COUT(1) << "S2 changed: " << s2 << std::endl; }
void Test::checkS3(){ COUT(1) << "S3 changed: " << s3 << std::endl; }
void Test::checkS4(){ COUT(1) << "S4 changed: " << s4 << std::endl; }
-
+
void Test::printPointer(){ CCOUT(1) << "pointer: " << this->pointer_ << endl; }
}
Modified: code/branches/consolecommands3/src/orxonox/controllers/AIController.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/controllers/AIController.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/controllers/AIController.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -30,7 +30,7 @@
#include "util/Math.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
#include "worldentities/ControllableEntity.h"
#include "worldentities/pawns/Pawn.h"
Modified: code/branches/consolecommands3/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/controllers/ArtificialController.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/controllers/ArtificialController.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -32,9 +32,9 @@
#include <climits>
#include "util/Math.h"
-#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
+#include "core/command/ConsoleCommand.h"
#include "worldentities/ControllableEntity.h"
#include "worldentities/pawns/Pawn.h"
#include "worldentities/pawns/TeamBaseMatchBase.h"
Modified: code/branches/consolecommands3/src/orxonox/controllers/DroneController.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/controllers/DroneController.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/controllers/DroneController.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -31,7 +31,7 @@
#include "util/Math.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
#include "worldentities/ControllableEntity.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/orxonox/controllers/HumanController.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/controllers/HumanController.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/controllers/HumanController.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -29,7 +29,7 @@
#include "HumanController.h"
#include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
+#include "core/command/ConsoleCommand.h"
#include "worldentities/ControllableEntity.h"
#include "worldentities/pawns/Pawn.h"
#include "gametypes/Gametype.h"
Modified: code/branches/consolecommands3/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/controllers/NewHumanController.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/controllers/NewHumanController.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -36,7 +36,7 @@
#include <bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
#include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
+#include "core/command/ConsoleCommand.h"
#include "worldentities/ControllableEntity.h"
#include "worldentities/pawns/Pawn.h"
#include "infos/PlayerInfo.h"
Modified: code/branches/consolecommands3/src/orxonox/gamestates/GSGraphics.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gamestates/GSGraphics.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/gamestates/GSGraphics.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -34,10 +34,10 @@
#include "GSGraphics.h"
-#include "core/CommandExecutor.h"
-#include "core/ConsoleCommand.h"
#include "core/Game.h"
#include "core/GUIManager.h"
+#include "core/command/ConsoleCommand.h"
+#include "core/command/CommandExecutor.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gamestates/GSLevel.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/gamestates/GSLevel.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -35,12 +35,12 @@
#include "core/input/InputManager.h"
#include "core/input/InputState.h"
#include "core/input/KeyBinderManager.h"
-#include "core/ConsoleCommand.h"
#include "core/Game.h"
#include "core/GameMode.h"
#include "core/GUIManager.h"
#include "core/Loader.h"
#include "core/XMLFile.h"
+#include "core/command/ConsoleCommand.h"
#include "LevelManager.h"
#include "PlayerManager.h"
Modified: code/branches/consolecommands3/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gamestates/GSMainMenu.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/gamestates/GSMainMenu.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -32,11 +32,11 @@
#include "core/input/KeyBinderManager.h"
#include "core/Game.h"
-#include "core/ConsoleCommand.h"
#include "core/ConfigValueIncludes.h"
#include "core/CoreIncludes.h"
#include "core/GraphicsManager.h"
#include "core/GUIManager.h"
+#include "core/command/ConsoleCommand.h"
#include "Scene.h"
#include "sound/AmbientSound.h"
// HACK
Modified: code/branches/consolecommands3/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gamestates/GSRoot.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/gamestates/GSRoot.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -30,9 +30,9 @@
#include "util/Clock.h"
#include "core/BaseObject.h"
-#include "core/ConsoleCommand.h"
#include "core/Game.h"
#include "core/GameMode.h"
+#include "core/command/ConsoleCommand.h"
#include "network/NetworkFunction.h"
#include "tools/Timer.h"
#include "tools/interfaces/Tickable.h"
Modified: code/branches/consolecommands3/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gametypes/Gametype.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/gametypes/Gametype.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -32,7 +32,7 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "core/GameMode.h"
-#include "core/ConsoleCommand.h"
+#include "core/command/ConsoleCommand.h"
#include "infos/PlayerInfo.h"
#include "infos/Bot.h"
Modified: code/branches/consolecommands3/src/orxonox/gametypes/TeamBaseMatch.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/gametypes/TeamBaseMatch.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/gametypes/TeamBaseMatch.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -29,7 +29,7 @@
#include "TeamBaseMatch.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
#include "worldentities/pawns/TeamBaseMatchBase.h"
#include "infos/PlayerInfo.h"
Modified: code/branches/consolecommands3/src/orxonox/graphics/ParticleSpawner.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/graphics/ParticleSpawner.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/graphics/ParticleSpawner.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -30,8 +30,8 @@
#include "core/CoreIncludes.h"
#include "core/EventIncludes.h"
-#include "core/Executor.h"
#include "core/XMLPort.h"
+#include "core/command/Executor.h"
#include "tools/ParticleInterface.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -46,8 +46,8 @@
#include "util/DisplayStringConversions.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
-#include "core/ConsoleCommand.h"
#include "core/ScopedSingletonManager.h"
+#include "core/command/ConsoleCommand.h"
#include "core/input/InputManager.h"
#include "core/input/InputState.h"
#include "core/input/InputBuffer.h"
Modified: code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.h
===================================================================
--- code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.h 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.h 2010-08-22 23:08:14 UTC (rev 7204)
@@ -36,8 +36,8 @@
#include "util/OgreForwardRefs.h"
#include "util/Singleton.h"
-#include "core/Shell.h"
#include "core/WindowEventListener.h"
+#include "core/command/Shell.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/orxonox/overlays/OrxonoxOverlay.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/overlays/OrxonoxOverlay.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/overlays/OrxonoxOverlay.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -47,7 +47,7 @@
#include "core/GameMode.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "core/ConsoleCommand.h"
+#include "core/command/ConsoleCommand.h"
#include "OverlayGroup.h"
Modified: code/branches/consolecommands3/src/orxonox/overlays/OverlayGroup.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/overlays/OverlayGroup.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/overlays/OverlayGroup.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -33,9 +33,9 @@
#include "OverlayGroup.h"
-#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
+#include "core/command/ConsoleCommand.h"
#include "OrxonoxOverlay.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/orxonox/sound/WorldSound.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/sound/WorldSound.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/sound/WorldSound.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -36,7 +36,6 @@
#include "core/XMLPort.h"
#include "Scene.h"
#include "SoundManager.h"
-#include <core/ConsoleCommandCompilation.h>
namespace orxonox
{
Modified: code/branches/consolecommands3/src/orxonox/worldentities/BigExplosion.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/worldentities/BigExplosion.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/worldentities/BigExplosion.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -30,8 +30,8 @@
#include "util/Exception.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
#include "core/GameMode.h"
+#include "core/command/Executor.h"
#include "tools/ParticleInterface.h"
#include "Scene.h"
#include "graphics/ParticleSpawner.h"
Modified: code/branches/consolecommands3/src/orxonox/worldentities/ExplosionChunk.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/worldentities/ExplosionChunk.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/worldentities/ExplosionChunk.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -29,8 +29,8 @@
#include "ExplosionChunk.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
#include "core/GameMode.h"
+#include "core/command/Executor.h"
#include "util/Exception.h"
#include "Scene.h"
#include "tools/ParticleInterface.h"
Modified: code/branches/consolecommands3/src/orxonox/worldentities/MovableEntity.cc
===================================================================
--- code/branches/consolecommands3/src/orxonox/worldentities/MovableEntity.cc 2010-08-22 22:58:52 UTC (rev 7203)
+++ code/branches/consolecommands3/src/orxonox/worldentities/MovableEntity.cc 2010-08-22 23:08:14 UTC (rev 7204)
@@ -30,9 +30,9 @@
#include "MovableEntity.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
#include "core/GameMode.h"
#include "core/XMLPort.h"
+#include "core/command/Executor.h"
#include "worldentities/pawns/Pawn.h"
namespace orxonox
More information about the Orxonox-commit
mailing list