summaryrefslogtreecommitdiff
path: root/application/main.cpp
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2021-03-15 23:40:04 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2021-03-15 23:40:04 +0000
commit125c9867da9cc58f0a250c7316f06755b1cc18ac (patch)
treea6ad259e48cd0d58b4755b3e662a9eeda2a21391 /application/main.cpp
parentRoute Walker returns Link::Nexts, not vector links (diff)
downloadilt-125c9867da9cc58f0a250c7316f06755b1cc18ac.tar.bz2
ilt-125c9867da9cc58f0a250c7316f06755b1cc18ac.tar.xz
ilt-125c9867da9cc58f0a250c7316f06755b1cc18ac.zip
Create GameState, the single global for the root of everything
Diffstat (limited to 'application/main.cpp')
-rw-r--r--application/main.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/application/main.cpp b/application/main.cpp
index f198517..df8828a 100644
--- a/application/main.cpp
+++ b/application/main.cpp
@@ -4,12 +4,12 @@
#include <game/activities/go.h>
#include <game/activities/idle.h>
#include <game/activity.h>
+#include <game/gamestate.h>
#include <game/network/rail.h>
#include <game/terrain.h>
#include <game/vehicles/railVehicle.h>
#include <game/vehicles/railVehicleClass.h>
#include <game/vehicles/train.h>
-#include <game/world.h>
#include <game/worldobject.h>
#include <gfx/camera_controller.h>
#include <gfx/gl/camera.h>
@@ -26,7 +26,7 @@
static const int DISPLAY_WIDTH = 1280;
static const int DISPLAY_HEIGHT = 1024;
-class SDL_Application : public InputHandler, public std::enable_shared_from_this<SDL_Application> {
+class SDL_Application : public InputHandler, public std::enable_shared_from_this<SDL_Application>, GameState {
public:
SDL_Application()
{
@@ -160,7 +160,6 @@ private:
bool isRunning {true};
Collection<InputHandler> inputStack;
- World world;
};
int