diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-13 11:00:02 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-17 15:39:39 -0400 |
| commit | 046ee24a341468e9b3ea2983a731dbce18b52ac6 (patch) | |
| tree | 554a645bbc9dac63433cf06e1a5168eb2551d02a /src/game.cpp | |
| parent | 5269e7c09a0b17c8c972c8ad996b04d42dbcd9cb (diff) | |
| download | therapy-046ee24a341468e9b3ea2983a731dbce18b52ac6.tar.gz therapy-046ee24a341468e9b3ea2983a731dbce18b52ac6.tar.bz2 therapy-046ee24a341468e9b3ea2983a731dbce18b52ac6.zip | |
Integrated RealizableComponent into RealizingSystem
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
| diff --git a/src/game.cpp b/src/game.cpp index f2992e1..c76349f 100644 --- a/src/game.cpp +++ b/src/game.cpp | |||
| @@ -32,7 +32,6 @@ void key_callback(GLFWwindow* window, int key, int, int action, int) | |||
| 32 | 32 | ||
| 33 | Game::Game(std::mt19937& rng) : rng_(rng) | 33 | Game::Game(std::mt19937& rng) : rng_(rng) |
| 34 | { | 34 | { |
| 35 | systemManager_.emplaceSystem<RealizingSystem>(*this); | ||
| 36 | systemManager_.emplaceSystem<PlayingSystem>(*this); | 35 | systemManager_.emplaceSystem<PlayingSystem>(*this); |
| 37 | systemManager_.emplaceSystem<SchedulingSystem>(*this); | 36 | systemManager_.emplaceSystem<SchedulingSystem>(*this); |
| 38 | systemManager_.emplaceSystem<ControllingSystem>(*this); | 37 | systemManager_.emplaceSystem<ControllingSystem>(*this); |
| @@ -42,7 +41,7 @@ Game::Game(std::mt19937& rng) : rng_(rng) | |||
| 42 | systemManager_.emplaceSystem<MappingSystem>(*this); | 41 | systemManager_.emplaceSystem<MappingSystem>(*this); |
| 43 | systemManager_.emplaceSystem<AnimatingSystem>(*this); | 42 | systemManager_.emplaceSystem<AnimatingSystem>(*this); |
| 44 | 43 | ||
| 45 | systemManager_.getSystem<RealizingSystem>().initSingleton( | 44 | systemManager_.emplaceSystem<RealizingSystem>(*this, |
| 46 | "res/maps.xml", | 45 | "res/maps.xml", |
| 47 | "res/entities.xml"); | 46 | "res/entities.xml"); |
| 48 | 47 | ||