reorganized BattleState's interface

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

diff --git a/src/battle/states/SelectItem.cpp b/src/battle/states/SelectItem.cpp
index a8c23bb763a9acaf9682dfd841044ae33d3bf8f6..22369f304252d6cf7ff82cae5e86bc738ebe2621 100644 (file)
--- a/src/battle/states/SelectItem.cpp
+++ b/src/battle/states/SelectItem.cpp
@@ -35,8 +35,8 @@ void SelectItem::ExitState(Application &c, SDL_Surface *screen) {
 }
 
 void SelectItem::ResumeState(Application &ctrl, SDL_Surface *screen) {
-       if (battle->ActiveHeroTargets().HasSelected()) {
-               battle->SetAttackType(AttackChoice::ITEM);
+       if (battle->ActiveHeroAttackChoice().Selection().HasSelected()) {
+               battle->ActiveHeroAttackChoice().SetType(AttackChoice::ITEM);
                battle->ActiveHeroAttackChoice().SetItem(battle->GetItemMenu().Selected());
                ctrl.PopState();
        }
@@ -56,25 +56,25 @@ void SelectItem::HandleEvents(const Input &input) {
        if (input.JustPressed(Input::ACTION_A)) {
                if (battle->GetItemMenu().SelectedIsEnabled()) {
                        const Item *item(battle->GetItemMenu().Selected());
-                       battle->ActiveHeroTargets().Reset();
+                       battle->ActiveHeroAttackChoice().Selection().Reset();
                        if (item->GetTargetingMode().TargetsAlly()) {
-                               battle->ActiveHeroTargets().SelectHeroes();
+                               battle->ActiveHeroAttackChoice().Selection().SelectHeroes();
                        } else {
-                               battle->ActiveHeroTargets().SelectEnemies();
+                               battle->ActiveHeroAttackChoice().Selection().SelectEnemies();
                        }
                        if (item->GetTargetingMode().TargetsAll()) {
-                               battle->SetAttackType(AttackChoice::ITEM);
+                               battle->ActiveHeroAttackChoice().SetType(AttackChoice::ITEM);
                                // TODO: remove item from inventory
                                battle->ActiveHeroAttackChoice().SetItem(item);
                                battle->NextHero();
                                ctrl->PopState();
                        } else {
                                if (item->GetTargetingMode().TargetsSingle()) {
-                                       battle->ActiveHeroTargets().SetSingle();
+                                       battle->ActiveHeroAttackChoice().Selection().SetSingle();
                                } else {
-                                       battle->ActiveHeroTargets().SetMultiple();
+                                       battle->ActiveHeroAttackChoice().Selection().SetMultiple();
                                }
-                               ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroTargets(), battle->Res().itemTargetCursor));
+                               ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroAttackChoice().Selection(), battle->Res().itemTargetCursor));
                        }
                }
        }