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/systems/mapping.cpp | |
parent | 5269e7c09a0b17c8c972c8ad996b04d42dbcd9cb (diff) | |
download | therapy-046ee24a341468e9b3ea2983a731dbce18b52ac6.tar.gz therapy-046ee24a341468e9b3ea2983a731dbce18b52ac6.tar.bz2 therapy-046ee24a341468e9b3ea2983a731dbce18b52ac6.zip |
Integrated RealizableComponent into RealizingSystem
Diffstat (limited to 'src/systems/mapping.cpp')
-rw-r--r-- | src/systems/mapping.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/systems/mapping.cpp b/src/systems/mapping.cpp index d78c8fe..1275e11 100644 --- a/src/systems/mapping.cpp +++ b/src/systems/mapping.cpp | |||
@@ -1,6 +1,5 @@ | |||
1 | #include "mapping.h" | 1 | #include "mapping.h" |
2 | #include "components/mappable.h" | 2 | #include "components/mappable.h" |
3 | #include "components/realizable.h" | ||
4 | #include "systems/realizing.h" | 3 | #include "systems/realizing.h" |
5 | #include "game.h" | 4 | #include "game.h" |
6 | #include "consts.h" | 5 | #include "consts.h" |
@@ -20,11 +19,8 @@ inline void addBoundary( | |||
20 | 19 | ||
21 | void MappingSystem::render(Texture& texture) | 20 | void MappingSystem::render(Texture& texture) |
22 | { | 21 | { |
23 | auto& realizable = game_.getEntityManager(). | 22 | id_type map = |
24 | getComponent<RealizableComponent>( | 23 | game_.getSystemManager().getSystem<RealizingSystem>().getActiveMap(); |
25 | game_.getSystemManager().getSystem<RealizingSystem>().getSingleton()); | ||
26 | |||
27 | id_type map = realizable.activeMap; | ||
28 | 24 | ||
29 | auto& mappable = game_.getEntityManager(). | 25 | auto& mappable = game_.getEntityManager(). |
30 | getComponent<MappableComponent>(map); | 26 | getComponent<MappableComponent>(map); |