From a0b995c97e7c7af6e07e9069b47370e74d747a3b Mon Sep 17 00:00:00 2001 From: Daniel Evans Date: Sat, 2 Jul 2016 19:49:31 +0100 Subject: [PATCH] Move game state classes into states folder --- rwgame/CMakeLists.txt | 19 +++++++++++++------ rwgame/RWGame.cpp | 8 ++++---- .../BenchmarkState.cpp} | 2 +- .../BenchmarkState.hpp} | 0 .../{debugstate.cpp => states/DebugState.cpp} | 2 +- .../{debugstate.hpp => states/DebugState.hpp} | 0 .../IngameState.cpp} | 6 +++--- .../IngameState.hpp} | 0 .../LoadingState.cpp} | 2 +- .../LoadingState.hpp} | 0 .../{menustate.cpp => states/MenuState.cpp} | 4 ++-- .../{menustate.hpp => states/MenuState.hpp} | 0 .../{pausestate.cpp => states/PauseState.cpp} | 2 +- .../{pausestate.hpp => states/PauseState.hpp} | 0 14 files changed, 26 insertions(+), 19 deletions(-) rename rwgame/{benchmarkstate.cpp => states/BenchmarkState.cpp} (98%) rename rwgame/{benchmarkstate.hpp => states/BenchmarkState.hpp} (100%) rename rwgame/{debugstate.cpp => states/DebugState.cpp} (99%) rename rwgame/{debugstate.hpp => states/DebugState.hpp} (100%) rename rwgame/{ingamestate.cpp => states/IngameState.cpp} (99%) rename rwgame/{ingamestate.hpp => states/IngameState.hpp} (100%) rename rwgame/{loadingstate.cpp => states/LoadingState.cpp} (97%) rename rwgame/{loadingstate.hpp => states/LoadingState.hpp} (100%) rename rwgame/{menustate.cpp => states/MenuState.cpp} (97%) rename rwgame/{menustate.hpp => states/MenuState.hpp} (100%) rename rwgame/{pausestate.cpp => states/PauseState.cpp} (97%) rename rwgame/{pausestate.hpp => states/PauseState.hpp} (100%) diff --git a/rwgame/CMakeLists.txt b/rwgame/CMakeLists.txt index 700d2260..05554ee7 100644 --- a/rwgame/CMakeLists.txt +++ b/rwgame/CMakeLists.txt @@ -13,12 +13,18 @@ set(RWGAME_SOURCES State.cpp - loadingstate.cpp - ingamestate.cpp - pausestate.cpp - menustate.cpp - debugstate.cpp - benchmarkstate.cpp + states/LoadingState.hpp + states/LoadingState.cpp + states/IngameState.hpp + states/IngameState.cpp + states/PauseState.hpp + 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" ) diff --git a/rwgame/RWGame.cpp b/rwgame/RWGame.cpp index 7149343c..639c64f6 100644 --- a/rwgame/RWGame.cpp +++ b/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 diff --git a/rwgame/benchmarkstate.cpp b/rwgame/states/BenchmarkState.cpp similarity index 98% rename from rwgame/benchmarkstate.cpp rename to rwgame/states/BenchmarkState.cpp index c576877b..baba4cf6 100644 --- a/rwgame/benchmarkstate.cpp +++ b/rwgame/states/BenchmarkState.cpp @@ -1,4 +1,4 @@ -#include "benchmarkstate.hpp" +#include "BenchmarkState.hpp" #include "RWGame.hpp" #include #include diff --git a/rwgame/benchmarkstate.hpp b/rwgame/states/BenchmarkState.hpp similarity index 100% rename from rwgame/benchmarkstate.hpp rename to rwgame/states/BenchmarkState.hpp diff --git a/rwgame/debugstate.cpp b/rwgame/states/DebugState.cpp similarity index 99% rename from rwgame/debugstate.cpp rename to rwgame/states/DebugState.cpp index 9bddc38f..2c8dac27 100644 --- a/rwgame/debugstate.cpp +++ b/rwgame/states/DebugState.cpp @@ -1,4 +1,4 @@ -#include "debugstate.hpp" +#include "DebugState.hpp" #include "RWGame.hpp" #include #include diff --git a/rwgame/debugstate.hpp b/rwgame/states/DebugState.hpp similarity index 100% rename from rwgame/debugstate.hpp rename to rwgame/states/DebugState.hpp diff --git a/rwgame/ingamestate.cpp b/rwgame/states/IngameState.cpp similarity index 99% rename from rwgame/ingamestate.cpp rename to rwgame/states/IngameState.cpp index e1b26446..06289ca8 100644 --- a/rwgame/ingamestate.cpp +++ b/rwgame/states/IngameState.cpp @@ -1,7 +1,7 @@ -#include "ingamestate.hpp" +#include "IngameState.hpp" #include "RWGame.hpp" -#include "pausestate.hpp" -#include "debugstate.hpp" +#include "PauseState.hpp" +#include "DebugState.hpp" #include "DrawUI.hpp" #include diff --git a/rwgame/ingamestate.hpp b/rwgame/states/IngameState.hpp similarity index 100% rename from rwgame/ingamestate.hpp rename to rwgame/states/IngameState.hpp diff --git a/rwgame/loadingstate.cpp b/rwgame/states/LoadingState.cpp similarity index 97% rename from rwgame/loadingstate.cpp rename to rwgame/states/LoadingState.cpp index fa072ed5..ec04e8f0 100644 --- a/rwgame/loadingstate.cpp +++ b/rwgame/states/LoadingState.cpp @@ -1,4 +1,4 @@ -#include "loadingstate.hpp" +#include "LoadingState.hpp" #include "RWGame.hpp" #include diff --git a/rwgame/loadingstate.hpp b/rwgame/states/LoadingState.hpp similarity index 100% rename from rwgame/loadingstate.hpp rename to rwgame/states/LoadingState.hpp diff --git a/rwgame/menustate.cpp b/rwgame/states/MenuState.cpp similarity index 97% rename from rwgame/menustate.cpp rename to rwgame/states/MenuState.cpp index 7ce6923f..2678cccd 100644 --- a/rwgame/menustate.cpp +++ b/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 diff --git a/rwgame/menustate.hpp b/rwgame/states/MenuState.hpp similarity index 100% rename from rwgame/menustate.hpp rename to rwgame/states/MenuState.hpp diff --git a/rwgame/pausestate.cpp b/rwgame/states/PauseState.cpp similarity index 97% rename from rwgame/pausestate.cpp rename to rwgame/states/PauseState.cpp index 0566d33e..95139007 100644 --- a/rwgame/pausestate.cpp +++ b/rwgame/states/PauseState.cpp @@ -1,4 +1,4 @@ -#include "pausestate.hpp" +#include "PauseState.hpp" #include "RWGame.hpp" #include #include diff --git a/rwgame/pausestate.hpp b/rwgame/states/PauseState.hpp similarity index 100% rename from rwgame/pausestate.hpp rename to rwgame/states/PauseState.hpp