diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2017-03-28 11:21:33 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2017-03-28 11:21:33 -0400 |
| commit | 00f879600bcea8f1ec1775c941041ee6346a60ba (patch) | |
| tree | f9bb9ca811a2a565aed16ccab31cc2847539072f /src/components.cpp | |
| parent | ceef5de7d838e97c3d7f990023398181ee1500c2 (diff) | |
skirl can kill
Diffstat (limited to 'src/components.cpp')
| -rw-r--r-- | src/components.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/components.cpp b/src/components.cpp index dee56a6..14599c2 100644 --- a/src/components.cpp +++ b/src/components.cpp @@ -3,6 +3,7 @@ #include <entityx/entityx.h> #include <events.hpp> +#include <attack.hpp> #include <render.hpp> #include <ui.hpp> #include <engine.hpp> @@ -50,15 +51,18 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e // make the entity wander // TODO initialX and range? - if (0 && entity.has_component<Aggro>()) { + if (entity.has_component<Aggro>()) { auto ppos = game::engine.getSystem<PlayerSystem>()->getPosition(); if (ppos.x > position.x && ppos.x < position.x + entity.component<Solid>()->width) { - auto& h = entity.component<Health>()->health; + auto dim = entity.component<Solid>(); + ev.emit<AttackEvent>(vec2(position.x + dim->width, position.y + dim->height), + AttackType::ShortSlash, false); + /*auto& h = entity.component<Health>()->health; if (h > 0) { fight = true; toFight = entity; h = 0; - } + }*/ } else direction.x = (ppos.x > position.x) ? .01 : -.01; } else if (entity.has_component<Wander>()) { |