summaryrefslogtreecommitdiffstats
path: root/src/gamestate
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/GameState.hpp (renamed from src/gamestate/GameState.hpp)7
-rw-r--r--src/world/GameState.cpp (renamed from src/gamestate/GameState.cpp)2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/gamestate/GameState.hpp b/include/GameState.hpp
index 27338fb..6741882 100644
--- a/src/gamestate/GameState.hpp
+++ b/include/GameState.hpp
@@ -3,9 +3,10 @@
#include <nlohmann/json.hpp>
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
-#include "../world/World.hpp"
-#include "../network/NetworkClient.hpp"
-#include "../utility/Vector.hpp"
+
+#include <world/World.hpp>
+#include <network/NetworkClient.hpp>
+#include <Vector.hpp>
class GameState {
NetworkClient *nc;
diff --git a/src/gamestate/GameState.cpp b/src/world/GameState.cpp
index 316d5f1..b484b06 100644
--- a/src/gamestate/GameState.cpp
+++ b/src/world/GameState.cpp
@@ -1,4 +1,4 @@
-#include "GameState.hpp"
+#include <GameState.hpp>
GameState::GameState(NetworkClient *Net, bool &quit) : nc(Net), isRunning(quit) {
Front = glm::vec3(0.0f, 0.0f, -1.0f);