[Orxonox-commit 5697] r10357 - in code/branches/core7/src/modules: dodgerace towerdefense
landauf at orxonox.net
landauf at orxonox.net
Sun Apr 12 11:58:06 CEST 2015
Author: landauf
Date: 2015-04-12 11:58:06 +0200 (Sun, 12 Apr 2015)
New Revision: 10357
Modified:
code/branches/core7/src/modules/dodgerace/DodgeRace.cc
code/branches/core7/src/modules/dodgerace/DodgeRace.h
code/branches/core7/src/modules/dodgerace/DodgeRaceCube.cc
code/branches/core7/src/modules/dodgerace/DodgeRaceShip.cc
code/branches/core7/src/modules/dodgerace/DodgeRaceShip.h
code/branches/core7/src/modules/towerdefense/TDCoordinate.h
Log:
don't include CoreIncludes.h in *.h files
Modified: code/branches/core7/src/modules/dodgerace/DodgeRace.cc
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRace.cc 2015-04-11 21:21:56 UTC (rev 10356)
+++ code/branches/core7/src/modules/dodgerace/DodgeRace.cc 2015-04-12 09:58:06 UTC (rev 10357)
@@ -34,6 +34,7 @@
#include "DodgeRace.h"
#include "DodgeRaceShip.h" // Necessary for getPlayer function. Do NOT include this in Header!
#include "DodgeRaceCube.h"
+#include "core/CoreIncludes.h"
namespace orxonox
{
Modified: code/branches/core7/src/modules/dodgerace/DodgeRace.h
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRace.h 2015-04-11 21:21:56 UTC (rev 10356)
+++ code/branches/core7/src/modules/dodgerace/DodgeRace.h 2015-04-12 09:58:06 UTC (rev 10357)
@@ -43,7 +43,6 @@
//#include "DodgeRaceHUDinfo.h"
-#include "core/CoreIncludes.h"
#include "core/EventIncludes.h"
#include "core/command/Executor.h"
#include "core/config/ConfigValueIncludes.h"
Modified: code/branches/core7/src/modules/dodgerace/DodgeRaceCube.cc
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRaceCube.cc 2015-04-11 21:21:56 UTC (rev 10356)
+++ code/branches/core7/src/modules/dodgerace/DodgeRaceCube.cc 2015-04-12 09:58:06 UTC (rev 10357)
@@ -32,6 +32,7 @@
#include "DodgeRaceCube.h"
#include "DodgeRace.h"
+#include "core/CoreIncludes.h"
namespace orxonox
{
Modified: code/branches/core7/src/modules/dodgerace/DodgeRaceShip.cc
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRaceShip.cc 2015-04-11 21:21:56 UTC (rev 10356)
+++ code/branches/core7/src/modules/dodgerace/DodgeRaceShip.cc 2015-04-12 09:58:06 UTC (rev 10357)
@@ -32,6 +32,7 @@
*/
#include "DodgeRaceShip.h"
+#include "core/CoreIncludes.h"
namespace orxonox
{
Modified: code/branches/core7/src/modules/dodgerace/DodgeRaceShip.h
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRaceShip.h 2015-04-11 21:21:56 UTC (rev 10356)
+++ code/branches/core7/src/modules/dodgerace/DodgeRaceShip.h 2015-04-12 09:58:06 UTC (rev 10357)
@@ -37,7 +37,6 @@
#include "dodgerace/DodgeRacePrereqs.h"
-#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "worldentities/pawns/SpaceShip.h"
#include "graphics/Camera.h"
Modified: code/branches/core7/src/modules/towerdefense/TDCoordinate.h
===================================================================
--- code/branches/core7/src/modules/towerdefense/TDCoordinate.h 2015-04-11 21:21:56 UTC (rev 10356)
+++ code/branches/core7/src/modules/towerdefense/TDCoordinate.h 2015-04-12 09:58:06 UTC (rev 10357)
@@ -1,7 +1,6 @@
#ifndef _TDCoordinate_H__
#define _TDCoordinate_H__
-#include "core/CoreIncludes.h"
#include "TDCoordinate.h"
//#include "towerdefense/TowerDefense.h"
#include "gametypes/Deathmatch.h"
More information about the Orxonox-commit
mailing list