X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=62e7c4619c4646eaaf81be6f679d84c7b11a8824;hb=b6469d8a22e60335fd8d9304569e648310ddc399;hp=db5bb45981c723727758a85968c9f8cfe947c01d;hpb=536a8c96ebfec2a2b34f680d3d0b97db8e66d599;p=l2e.git diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp index db5bb45..62e7c46 100644 --- a/src/battle/states/SelectSpell.cpp +++ b/src/battle/states/SelectSpell.cpp @@ -9,15 +9,18 @@ #include "SelectAttackType.h" #include "SelectMoveAction.h" +#include "SelectTarget.h" #include "../BattleState.h" #include "../../app/Application.h" #include "../../app/Input.h" +#include "../../common/Spell.h" #include "../../geometry/operators.h" #include "../../geometry/Point.h" #include "../../graphics/Frame.h" using app::Application; using app::Input; +using common::Spell; using geometry::Point; using geometry::Vector; using graphics::Frame; @@ -33,7 +36,9 @@ void SelectSpell::ExitState(Application &c, SDL_Surface *screen) { } void SelectSpell::ResumeState(Application &ctrl, SDL_Surface *screen) { - + if (battle->ActiveHeroTargets().HasSelected()) { + ctrl.PopState(); + } } void SelectSpell::PauseState(Application &ctrl, SDL_Surface *screen) { @@ -48,11 +53,28 @@ void SelectSpell::Resize(int width, int height) { void SelectSpell::HandleInput(const Input &input) { if (input.JustPressed(Input::ACTION_A)) { - // TODO: switch to target select if (battle->GetSpellMenu().SelectedIsEnabled()) { - battle->SetAttackType(AttackChoice::MAGIC); - battle->NextHero(); - ctrl->PopState(); + const Spell *spell(battle->GetSpellMenu().Selected()); + battle->ActiveHeroTargets().Reset(); + if (spell->GetTargetingMode().TargetsAlly()) { + battle->ActiveHeroTargets().SelectHeroes(); + } else { + battle->ActiveHeroTargets().SelectEnemies(); + } + if (spell->GetTargetingMode().TargetsAll()) { + battle->SetAttackType(AttackChoice::MAGIC); + // TODO: remove item from inventory + battle->ActiveHeroAttackChoice().SetSpell(spell); + battle->NextHero(); + ctrl->PopState(); + } else { + if (spell->GetTargetingMode().TargetsSingle()) { + battle->ActiveHeroTargets().SetSingle(); + } else { + battle->ActiveHeroTargets().SetMultiple(); + } + ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroTargets(), battle->Res().magicTargetCursor)); + } } } if (input.JustPressed(Input::ACTION_B)) {