added dummy state that echoes all selected attacks

[l2e.git] / src / battle / states / SelectSpell.cpp

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index db5bb45981c723727758a85968c9f8cfe947c01d..a9c06cceccc912ca59e3530ce361e52b7fbb2880 100644 (file)
--- 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,11 @@ void SelectSpell::ExitState(Application &c, SDL_Surface *screen) {
 }
 
 void SelectSpell::ResumeState(Application &ctrl, SDL_Surface *screen) {
-
+       if (battle->ActiveHeroTargets().HasSelected()) {
+               battle->SetAttackType(AttackChoice::MAGIC);
+               battle->ActiveHeroAttackChoice().SetSpell(battle->GetSpellMenu().Selected());
+               ctrl.PopState();
+       }
 }
 
 void SelectSpell::PauseState(Application &ctrl, SDL_Surface *screen) {
@@ -46,13 +53,30 @@ void SelectSpell::Resize(int width, int height) {
 }
 
 
-void SelectSpell::HandleInput(const Input &input) {
+void SelectSpell::HandleEvents(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)) {