summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2019-04-21 15:06:55 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2019-04-21 15:06:55 +0200
commitd4e9d6bbc0abe66acb149a358a25c9a0f385ce74 (patch)
treef6d5890c18fa20eb554a2df03b186886acc0ef1b
parentTrying to fix build in linux (diff)
downloadAltCraft-d4e9d6bbc0abe66acb149a358a25c9a0f385ce74.tar
AltCraft-d4e9d6bbc0abe66acb149a358a25c9a0f385ce74.tar.gz
AltCraft-d4e9d6bbc0abe66acb149a358a25c9a0f385ce74.tar.bz2
AltCraft-d4e9d6bbc0abe66acb149a358a25c9a0f385ce74.tar.lz
AltCraft-d4e9d6bbc0abe66acb149a358a25c9a0f385ce74.tar.xz
AltCraft-d4e9d6bbc0abe66acb149a358a25c9a0f385ce74.tar.zst
AltCraft-d4e9d6bbc0abe66acb149a358a25c9a0f385ce74.zip
-rw-r--r--src/Game.cpp (renamed from src/GlobalState.cpp)2
-rw-r--r--src/Game.hpp (renamed from src/GlobalState.hpp)0
-rw-r--r--src/Render.cpp2
-rw-r--r--src/RendererEntity.cpp2
-rw-r--r--src/main.cpp2
5 files changed, 4 insertions, 4 deletions
diff --git a/src/GlobalState.cpp b/src/Game.cpp
index afa1a56..46785b1 100644
--- a/src/GlobalState.cpp
+++ b/src/Game.cpp
@@ -1,4 +1,4 @@
-#include "GlobalState.hpp"
+#include "Game.hpp"
#include "NetworkClient.hpp"
#include "GameState.hpp"
diff --git a/src/GlobalState.hpp b/src/Game.hpp
index bc7224f..bc7224f 100644
--- a/src/GlobalState.hpp
+++ b/src/Game.hpp
diff --git a/src/Render.cpp b/src/Render.cpp
index f86e5ec..a20ce21 100644
--- a/src/Render.cpp
+++ b/src/Render.cpp
@@ -8,7 +8,7 @@
#include "AssetManager.hpp"
#include "Event.hpp"
#include "DebugInfo.hpp"
-#include "GlobalState.hpp"
+#include "Game.hpp"
#include "World.hpp"
#include "GameState.hpp"
#include "RendererWorld.hpp"
diff --git a/src/RendererEntity.cpp b/src/RendererEntity.cpp
index 25403be..ed1e854 100644
--- a/src/RendererEntity.cpp
+++ b/src/RendererEntity.cpp
@@ -7,7 +7,7 @@
#include "GameState.hpp"
#include "Renderer.hpp"
#include "AssetManager.hpp"
-#include "GlobalState.hpp"
+#include "Game.hpp"
const GLfloat vertices[] = {
-0.5f, 0.5f, 0.5f,
diff --git a/src/main.cpp b/src/main.cpp
index cb2daa8..100b7bc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
#include "Event.hpp"
#include "Utility.hpp"
-#include "GlobalState.hpp"
+#include "Game.hpp"
#include <set>