summary refs log tree commit diff stats
path: root/src/game.cpp
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2018-02-18 15:25:52 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2018-02-18 15:25:52 -0500
commite4e2f2d2a7b6a282b9618aa0004d9453936f43c6 (patch)
treede1653dc8b5992420147f28d9fb4de052ea1845f /src/game.cpp
parente16fb5be90c889c371cbb0ca2444735c2e12073c (diff)
downloadtherapy-e4e2f2d2a7b6a282b9618aa0004d9453936f43c6.tar.gz
therapy-e4e2f2d2a7b6a282b9618aa0004d9453936f43c6.tar.bz2
therapy-e4e2f2d2a7b6a282b9618aa0004d9453936f43c6.zip
Added player death and event scheduling
Also added ability to make sprites flicker, to freeze physics for an entity, and to freeze progression of a sprite's animation loop.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp index f245e7c..3da23a3 100644 --- a/src/game.cpp +++ b/src/game.cpp
@@ -10,6 +10,7 @@
10#include "systems/mapping.h" 10#include "systems/mapping.h"
11#include "systems/orienting.h" 11#include "systems/orienting.h"
12#include "systems/playing.h" 12#include "systems/playing.h"
13#include "systems/scheduling.h"
13#include "animation.h" 14#include "animation.h"
14#include "consts.h" 15#include "consts.h"
15 16
@@ -30,6 +31,7 @@ void key_callback(GLFWwindow* window, int key, int, int action, int)
30Game::Game() : world_("res/maps.xml") 31Game::Game() : world_("res/maps.xml")
31{ 32{
32 systemManager_.emplaceSystem<PlayingSystem>(*this); 33 systemManager_.emplaceSystem<PlayingSystem>(*this);
34 systemManager_.emplaceSystem<SchedulingSystem>(*this);
33 systemManager_.emplaceSystem<ControllingSystem>(*this); 35 systemManager_.emplaceSystem<ControllingSystem>(*this);
34 systemManager_.emplaceSystem<OrientingSystem>(*this); 36 systemManager_.emplaceSystem<OrientingSystem>(*this);
35 systemManager_.emplaceSystem<PonderingSystem>(*this); 37 systemManager_.emplaceSystem<PonderingSystem>(*this);