Move game state classes into states folder

rwgame/CMakeLists.txt

@@ -13,12 +13,18 @@ set(RWGAME_SOURCES
 
 	State.cpp
 
-	loadingstate.cpp
+	states/LoadingState.hpp
-	ingamestate.cpp
+	states/LoadingState.cpp
-	pausestate.cpp
+	states/IngameState.hpp
-	menustate.cpp
+	states/IngameState.cpp
-	debugstate.cpp
+	states/PauseState.hpp
-	benchmarkstate.cpp
+	states/PauseState.cpp
+	states/MenuState.hpp
+	states/MenuState.cpp
+	states/DebugState.hpp
+	states/DebugState.cpp
+	states/BenchmarkState.hpp
+	states/BenchmarkState.cpp
 	
 	DrawUI.cpp
 )
@@ -31,6 +37,7 @@ include_directories(SYSTEM
 	${OPENAL_INCLUDE_DIR}
 	)
 include_directories(
+	"${CMAKE_SOURCE_DIR}/rwgame"
 	"${CMAKE_SOURCE_DIR}/rwengine/include"
 	)
 

rwgame/RWGame.cpp

@@ -1,10 +1,10 @@
 #include "RWGame.hpp"
 #include "State.hpp"
-#include "loadingstate.hpp"
+#include "states/LoadingState.hpp"
+#include "states/IngameState.hpp"
+#include "states/MenuState.hpp"
+#include "states/BenchmarkState.hpp"
 #include "DrawUI.hpp"
-#include "ingamestate.hpp"
-#include "menustate.hpp"
-#include "benchmarkstate.hpp"
 
 #include <core/Profiler.hpp>
 

rwgame/states/BenchmarkState.cpp

@@ -1,4 +1,4 @@
-#include "benchmarkstate.hpp"
+#include "BenchmarkState.hpp"
 #include "RWGame.hpp"
 #include <engine/GameState.hpp>
 #include <fstream>

rwgame/states/DebugState.cpp

@@ -1,4 +1,4 @@
-#include "debugstate.hpp"
+#include "DebugState.hpp"
 #include "RWGame.hpp"
 #include <ai/PlayerController.hpp>
 #include <objects/CharacterObject.hpp>

rwgame/states/IngameState.cpp

@@ -1,7 +1,7 @@
-#include "ingamestate.hpp"
+#include "IngameState.hpp"
 #include "RWGame.hpp"
-#include "pausestate.hpp"
+#include "PauseState.hpp"
-#include "debugstate.hpp"
+#include "DebugState.hpp"
 #include "DrawUI.hpp"
 
 #include <ai/PlayerController.hpp>

rwgame/states/LoadingState.cpp

@@ -1,4 +1,4 @@
-#include "loadingstate.hpp"
+#include "LoadingState.hpp"
 #include "RWGame.hpp"
 #include <render/OpenGLRenderer.hpp>
 

rwgame/states/MenuState.cpp

@@ -1,6 +1,6 @@
-#include "menustate.hpp"
+#include "MenuState.hpp"
 #include "game.hpp"
-#include "ingamestate.hpp"
+#include "IngameState.hpp"
 
 #include "RWGame.hpp"
 #include <engine/SaveGame.hpp>

rwgame/states/PauseState.cpp

@@ -1,4 +1,4 @@
-#include "pausestate.hpp"
+#include "PauseState.hpp"
 #include "RWGame.hpp"
 #include <ai/PlayerController.hpp>
 #include <objects/CharacterObject.hpp>