X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectAttackType.cpp;h=17260928af9455b7a6aaa40468a4cd52276e0da5;hb=e27fcf693589ede18b753d5f64f9dfecfe6344bd;hp=c0073208195e923086eeadb9f744a5764545cdda;hpb=3c72a71fbf6de96333a641051a20c6bf8b3a5df3;p=l2e.git

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index c007320..1726092 100644
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -36,8 +36,8 @@ void SelectAttackType::ExitState(Application &c, SDL_Surface *screen) {
 }
 
 void SelectAttackType::ResumeState(Application &ctrl, SDL_Surface *screen) {
-	if (battle->ActiveHeroTargets().HasSelected()) {
-		battle->SetAttackType(battle->GetAttackTypeMenu().Selected());
+	if (battle->ActiveHeroAttackChoice().Selection().HasSelected()) {
+		battle->ActiveHeroAttackChoice().SetType(battle->GetAttackTypeMenu().Selected());
 		battle->NextHero();
 	}
 	if (battle->AttackSelectionDone()) {
@@ -56,7 +56,7 @@ void SelectAttackType::Resize(int width, int height) {
 }
 
 
-void SelectAttackType::HandleInput(const Input &input) {
+void SelectAttackType::HandleEvents(const Input &input) {
 	if (input.IsDown(Input::PAD_UP)) {
 		battle->GetAttackTypeMenu().Select(AttackChoice::MAGIC);
 	} else if (input.IsDown(Input::PAD_RIGHT)) {
@@ -73,9 +73,9 @@ void SelectAttackType::HandleInput(const Input &input) {
 		switch (battle->GetAttackTypeMenu().Selected()) {
 			case AttackChoice::SWORD:
 				// TODO: detect single/multiple/all attack mode
-				battle->ActiveHeroTargets().SetSingle();
-				battle->ActiveHeroTargets().Reset();
-				ctrl->PushState(new SelectTarget(battle, this, &battle->ActiveHeroTargets(), battle->Res().weaponTargetCursor, true));
+				battle->ActiveHeroAttackChoice().Selection().SetSingle();
+				battle->ActiveHeroAttackChoice().Selection().Reset();
+				ctrl->PushState(new SelectTarget(battle, this, &battle->ActiveHeroAttackChoice().Selection(), battle->Res().weaponTargetCursor));
 				break;
 			case AttackChoice::MAGIC:
 				if (battle->ActiveHero().CanUseMagic()) {
@@ -83,7 +83,7 @@ void SelectAttackType::HandleInput(const Input &input) {
 				}
 				break;
 			case AttackChoice::DEFEND:
-				battle->SetAttackType(AttackChoice::DEFEND);
+				battle->ActiveHeroAttackChoice().SetType(AttackChoice::DEFEND);
 				battle->NextHero();
 				break;
 			case AttackChoice::IKARI:
@@ -96,10 +96,12 @@ void SelectAttackType::HandleInput(const Input &input) {
 				throw std::logic_error("selected invalid attack type");
 		}
 	} else if (input.JustPressed(Input::ACTION_B)) {
+		battle->ActiveHeroAttackChoice().Reset();
 		battle->PreviousHero();
-		battle->SetAttackType(AttackChoice::UNDECIDED);
 		if (battle->BeforeFirstHero()) {
 			ctrl->ChangeState(new SelectMoveAction(battle));
+		} else {
+			battle->ActiveHeroAttackChoice().Reset();
 		}
 	}