diff options
Diffstat (limited to 'src/game.cpp')
-rw-r--r-- | src/game.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp index 7cbe7e0..39bb3f1 100644 --- a/src/game.cpp +++ b/src/game.cpp | |||
@@ -2,13 +2,13 @@ | |||
2 | #include "components/animatable.h" | 2 | #include "components/animatable.h" |
3 | #include "components/transformable.h" | 3 | #include "components/transformable.h" |
4 | #include "components/controllable.h" | 4 | #include "components/controllable.h" |
5 | #include "components/droppable.h" | ||
6 | #include "components/ponderable.h" | 5 | #include "components/ponderable.h" |
7 | #include "components/orientable.h" | 6 | #include "components/orientable.h" |
8 | #include "systems/controlling.h" | 7 | #include "systems/controlling.h" |
9 | #include "systems/pondering.h" | 8 | #include "systems/pondering.h" |
10 | #include "systems/animating.h" | 9 | #include "systems/animating.h" |
11 | #include "systems/mapping.h" | 10 | #include "systems/mapping.h" |
11 | #include "systems/orienting.h" | ||
12 | #include "animation.h" | 12 | #include "animation.h" |
13 | #include "renderer.h" | 13 | #include "renderer.h" |
14 | #include "consts.h" | 14 | #include "consts.h" |
@@ -33,6 +33,7 @@ Game::Game( | |||
33 | world_("res/maps.xml") | 33 | world_("res/maps.xml") |
34 | { | 34 | { |
35 | systemManager_.emplaceSystem<ControllingSystem>(*this); | 35 | systemManager_.emplaceSystem<ControllingSystem>(*this); |
36 | systemManager_.emplaceSystem<OrientingSystem>(*this); | ||
36 | systemManager_.emplaceSystem<PonderingSystem>(*this); | 37 | systemManager_.emplaceSystem<PonderingSystem>(*this); |
37 | systemManager_.emplaceSystem<MappingSystem>(*this); | 38 | systemManager_.emplaceSystem<MappingSystem>(*this); |
38 | systemManager_.emplaceSystem<AnimatingSystem>(*this); | 39 | systemManager_.emplaceSystem<AnimatingSystem>(*this); |
@@ -58,7 +59,6 @@ Game::Game( | |||
58 | player, | 59 | player, |
59 | PonderableComponent::Type::freefalling); | 60 | PonderableComponent::Type::freefalling); |
60 | 61 | ||
61 | entityManager_.emplaceComponent<DroppableComponent>(player); | ||
62 | entityManager_.emplaceComponent<ControllableComponent>(player); | 62 | entityManager_.emplaceComponent<ControllableComponent>(player); |
63 | entityManager_.emplaceComponent<OrientableComponent>(player); | 63 | entityManager_.emplaceComponent<OrientableComponent>(player); |
64 | 64 | ||