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/pondering.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/pondering.cpp')
-rw-r--r-- | src/systems/pondering.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/systems/pondering.cpp b/src/systems/pondering.cpp index a3eb36d..d841679 100644 --- a/src/systems/pondering.cpp +++ b/src/systems/pondering.cpp | |||
@@ -6,7 +6,6 @@ | |||
6 | #include "components/transformable.h" | 6 | #include "components/transformable.h" |
7 | #include "components/orientable.h" | 7 | #include "components/orientable.h" |
8 | #include "components/mappable.h" | 8 | #include "components/mappable.h" |
9 | #include "components/realizable.h" | ||
10 | #include "components/playable.h" | 9 | #include "components/playable.h" |
11 | #include "systems/orienting.h" | 10 | #include "systems/orienting.h" |
12 | #include "systems/playing.h" | 11 | #include "systems/playing.h" |
@@ -485,11 +484,8 @@ void PonderingSystem::detectCollisionsInDirection( | |||
485 | CollisionResult& result) | 484 | CollisionResult& result) |
486 | { | 485 | { |
487 | // Get map data. | 486 | // Get map data. |
488 | auto& realizable = game_.getEntityManager(). | 487 | id_type mapEntity = |
489 | getComponent<RealizableComponent>( | 488 | game_.getSystemManager().getSystem<RealizingSystem>().getActiveMap(); |
490 | game_.getSystemManager().getSystem<RealizingSystem>().getSingleton()); | ||
491 | |||
492 | id_type mapEntity = realizable.activeMap; | ||
493 | 489 | ||
494 | auto& mappable = game_.getEntityManager(). | 490 | auto& mappable = game_.getEntityManager(). |
495 | getComponent<MappableComponent>(mapEntity); | 491 | getComponent<MappableComponent>(mapEntity); |