diff --git a/include/Game/HealthSystem.h b/include/Game/HealthSystem.h index a836e797..11ac68bd 100644 --- a/include/Game/HealthSystem.h +++ b/include/Game/HealthSystem.h @@ -6,9 +6,9 @@ #include "Common.h" #include "Core/System.h" -#include "Core\EPlayerDamage.h"; -#include "Core\EPlayerHealthPickup.h"; -#include "Core\EPlayerDeath.h"; +#include "Core/EPlayerDamage.h"; +#include "Core/EPlayerHealthPickup.h"; +#include "Core/EPlayerDeath.h"; #include #include diff --git a/include/Game/PlayerSystem.h b/include/Game/PlayerSystem.h index 897ee207..a48af3e4 100644 --- a/include/Game/PlayerSystem.h +++ b/include/Game/PlayerSystem.h @@ -7,8 +7,8 @@ #include "Common.h" #include "Core/System.h" #include "Collision/ETrigger.h" -#include "Core\EMouseRelease.h" -#include "Core\EShoot.h" +#include "Core/EMouseRelease.h" +#include "Core/EShoot.h" class PlayerSystem : public PureSystem { diff --git a/src/Tests/CollisionTest.cpp b/src/Tests/CollisionTest.cpp index e6a29298..57329477 100644 --- a/src/Tests/CollisionTest.cpp +++ b/src/Tests/CollisionTest.cpp @@ -13,9 +13,9 @@ using boost::unit_test_framework::test_case; #include //ray vs model -#include "Engine\Core\ResourceManager.h" -#include "Engine\Rendering\Model.h" -#include "Engine\Core\Ray.h" +#include "Engine/Core/ResourceManager.h" +#include "Engine/Rendering/Model.h" +#include "Engine/Core/Ray.h" //vs memleaks //#define _CRTDBG_MAP_ALLOC diff --git a/src/Tests/ConfigFileTest.cpp b/src/Tests/ConfigFileTest.cpp index 28be5589..36cd6c05 100644 --- a/src/Tests/ConfigFileTest.cpp +++ b/src/Tests/ConfigFileTest.cpp @@ -5,7 +5,7 @@ using boost::unit_test_framework::test_case; #include //srand //#define private public -#include "Engine\Core\ConfigFile.h" +#include "Engine/Core/ConfigFile.h" #define _CRTDBG_MAP_ALLOC #include diff --git a/src/Tests/EventFixture.h b/src/Tests/EventFixture.h index 42258932..a708b962 100644 --- a/src/Tests/EventFixture.h +++ b/src/Tests/EventFixture.h @@ -2,7 +2,7 @@ #define EVENTFIXTURE_H #include -#include "Core\EventBroker.h" +#include "Core/EventBroker.h" template struct EventFixture diff --git a/src/Tests/InputManagerTest.cpp b/src/Tests/InputManagerTest.cpp index 5b447c2b..0ef9434a 100644 --- a/src/Tests/InputManagerTest.cpp +++ b/src/Tests/InputManagerTest.cpp @@ -1,6 +1,6 @@ #include -#include "Engine\Core\InputManager.h" +#include "Engine/Core/InputManager.h" BOOST_AUTO_TEST_SUITE(inputManagerTests) diff --git a/src/Tests/OctTreeTestAnders.cpp b/src/Tests/OctTreeTestAnders.cpp index b61caead..477ccbf4 100644 --- a/src/Tests/OctTreeTestAnders.cpp +++ b/src/Tests/OctTreeTestAnders.cpp @@ -15,7 +15,7 @@ using boost::unit_test_framework::test_case; #include "OctTreeTestGameClass.h" #define private public//HACK! Needed for white box testing -#include +#include "Engine/Core/OctTree.h" //else we would have to "open up" the octTree class more with get/sets, public methods, etc. which is not good encapsulation-wise BOOST_AUTO_TEST_SUITE(octTreeTestsA) diff --git a/src/Tests/OctTreeTestHardCodedTestWorld.h b/src/Tests/OctTreeTestHardCodedTestWorld.h index 512716df..6f68eba6 100644 --- a/src/Tests/OctTreeTestHardCodedTestWorld.h +++ b/src/Tests/OctTreeTestHardCodedTestWorld.h @@ -9,7 +9,7 @@ //last! //#include "OldOctTree.h" #define private public -#include +#include class HardcodedTestWorld : public World { diff --git a/src/Tests/ResourceManagerTest.cpp b/src/Tests/ResourceManagerTest.cpp index 9d62fa93..b68936ec 100644 --- a/src/Tests/ResourceManagerTest.cpp +++ b/src/Tests/ResourceManagerTest.cpp @@ -7,7 +7,7 @@ #include "Core/ResourceManager.h" #include "Core/ConfigFile.h" #include "Rendering/Renderer.h" -#include "Engine\Rendering\Texture.h" +#include "Engine/Rendering/Texture.h" BOOST_AUTO_TEST_SUITE(resourceManagerTests) diff --git a/src/Tests/ShootEventTest.h b/src/Tests/ShootEventTest.h index 21ae7d9e..e860f41f 100644 --- a/src/Tests/ShootEventTest.h +++ b/src/Tests/ShootEventTest.h @@ -17,8 +17,8 @@ #include "Core/EntityFileParser.h" #include "Core/EntityFileWriter.h" -#include "Core\EMouseRelease.h" -#include "Core\EShoot.h" +#include "Core/EMouseRelease.h" +#include "Core/EShoot.h" class ShootEventTest {