diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2017-07-23 10:47:10 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2017-07-23 10:47:10 -0400 |
| commit | 9e540db7d6492168cadcafddbf145ffdd7b21981 (patch) | |
| tree | 8019a7a67e66a5ec87ad7872278e8ee92431251a /src/systems | |
| parent | 215e5ee6ce089c3e0d5be28fd816bc7031b6acab (diff) | |
source cleanup; beginning of custom attacks
Diffstat (limited to 'src/systems')
| -rw-r--r-- | src/systems/dialog.cpp | 4 | ||||
| -rw-r--r-- | src/systems/movement.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/systems/dialog.cpp b/src/systems/dialog.cpp index 76c0f93..87327ca 100644 --- a/src/systems/dialog.cpp +++ b/src/systems/dialog.cpp @@ -51,7 +51,7 @@ void DialogSystem::receive(const MouseClickEvent &mce) d.talking = true; if (d.index == 9999) { - UISystem::dialogBox(name.name, /*"", false,*/ randomDialog[d.rindex % randomDialog.size()]); + UISystem::dialogBox(name.name, randomDialog[d.rindex % randomDialog.size()]); UISystem::waitForDialog(); } else if (exml != nullptr) { while (exml->StrAttribute("name") != name.name) @@ -96,7 +96,7 @@ void DialogSystem::receive(const MouseClickEvent &mce) if (qname != nullptr && QuestSystem::finish(qname) == 0) { d.index = 9999; } else { - UISystem::dialogBox(name.name, /*"", false,*/ "Finish my quest u nug"); + UISystem::dialogBox(name.name, "Finish my quest u nug"); UISystem::waitForDialog(); return; } diff --git a/src/systems/movement.cpp b/src/systems/movement.cpp index 00baa40..7ff9966 100644 --- a/src/systems/movement.cpp +++ b/src/systems/movement.cpp @@ -46,9 +46,8 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e auto ppos = PlayerSystem::getPosition(); if (ppos.x > position.x && ppos.x < position.x + entity.component<Solid>()->width) { if (entity.has_component<Aggro>()) { - auto dim = entity.component<Solid>(); - ev.emit<AttackEvent>(vec2(position.x + dim->width, position.y + dim->height), - AttackType::ShortSlash, false); + //auto dim = entity.component<Solid>(); + //ev.emit<AttackEvent>(vec2(position.x + dim->width, position.y + dim->height), ATTACKKKKKK, false); /*auto& h = entity.component<Health>()->health; if (h > 0) { fight = true; |