[Orxonox-commit 6169] r10827 - code/branches/AI_HS15/src/orxonox/controllers
gania at orxonox.net
gania at orxonox.net
Sun Nov 22 17:16:59 CET 2015
Author: gania
Date: 2015-11-22 17:16:59 +0100 (Sun, 22 Nov 2015)
New Revision: 10827
Modified:
code/branches/AI_HS15/src/orxonox/controllers/CommonController.h
code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h
code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc
code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h
code/branches/AI_HS15/src/orxonox/controllers/SectionController.h
code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h
Log:
same as before, a bit of polish up
Modified: code/branches/AI_HS15/src/orxonox/controllers/CommonController.h
===================================================================
--- code/branches/AI_HS15/src/orxonox/controllers/CommonController.h 2015-11-22 16:06:38 UTC (rev 10826)
+++ code/branches/AI_HS15/src/orxonox/controllers/CommonController.h 2015-11-22 16:16:59 UTC (rev 10827)
@@ -33,6 +33,10 @@
#include "controllers/Controller.h"
#include "worldentities/ControllableEntity.h"
#include "worldentities/pawns/Pawn.h"
+#include "util/Math.h"
+
+#include "tools/Timer.h"
+#include "tools/interfaces/Tickable.h"
#include <limits>
Modified: code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h
===================================================================
--- code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h 2015-11-22 16:06:38 UTC (rev 10826)
+++ code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h 2015-11-22 16:16:59 UTC (rev 10827)
@@ -32,9 +32,6 @@
#include "controllers/LeaderController.h"
-#include "util/Math.h"
-#include "tools/Timer.h"
-#include "tools/interfaces/Tickable.h"
namespace orxonox
{
Modified: code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc
===================================================================
--- code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc 2015-11-22 16:06:38 UTC (rev 10826)
+++ code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc 2015-11-22 16:16:59 UTC (rev 10827)
@@ -27,14 +27,8 @@
*/
#include "LeaderController.h"
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "core/command/ConsoleCommandIncludes.h"
-#include "worldentities/ControllableEntity.h"
-#include "worldentities/pawns/Pawn.h"
-
namespace orxonox
{
Modified: code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h
===================================================================
--- code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h 2015-11-22 16:06:38 UTC (rev 10826)
+++ code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h 2015-11-22 16:16:59 UTC (rev 10827)
@@ -33,7 +33,6 @@
#include "controllers/WingmanController.h"
-#include "util/Math.h"
namespace orxonox
Modified: code/branches/AI_HS15/src/orxonox/controllers/SectionController.h
===================================================================
--- code/branches/AI_HS15/src/orxonox/controllers/SectionController.h 2015-11-22 16:06:38 UTC (rev 10826)
+++ code/branches/AI_HS15/src/orxonox/controllers/SectionController.h 2015-11-22 16:16:59 UTC (rev 10827)
@@ -31,8 +31,6 @@
#include "controllers/LeaderController.h"
-#include "tools/Timer.h"
-#include "tools/interfaces/Tickable.h"
namespace orxonox
{
Modified: code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h
===================================================================
--- code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h 2015-11-22 16:06:38 UTC (rev 10826)
+++ code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h 2015-11-22 16:16:59 UTC (rev 10827)
@@ -33,11 +33,6 @@
#include "controllers/CommonController.h"
-#include "util/Math.h"
-#include "tools/Timer.h"
-#include "tools/interfaces/Tickable.h"
-
-
namespace orxonox
{
class _OrxonoxExport WingmanController : public CommonController, public Tickable
@@ -45,7 +40,7 @@
public:
//----[language demanded functions]----
WingmanController(Context* context);
-
+
virtual ~WingmanController();
//----[/language demanded functions]----
More information about the Orxonox-commit
mailing list