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

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index c007320..90d483c 100644
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -75,7 +75,7 @@ void SelectAttackType::HandleInput(const Input &input) {
 				// 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));
+				ctrl->PushState(new SelectTarget(battle, this, &battle->ActiveHeroTargets(), battle->Res().weaponTargetCursor));
 				break;
 			case AttackChoice::MAGIC:
 				if (battle->ActiveHero().CanUseMagic()) {
@@ -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();
 		}
 	}