X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectAttackType.cpp;h=90d483ca693cd5018110252dddda6dd215262a20;hb=cec6ebf5e666a15ffe27b0f09f9b268e2cfcdf9b;hp=1039e513125432ed9c4c509889a17543ff6250a5;hpb=26ea92a0e275e32f1fc166cde407a02c3e7e476b;p=l2e.git

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index 1039e51..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,11 +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();
 		if (battle->BeforeFirstHero()) {
 			ctrl->ChangeState(new SelectMoveAction(battle));
 		} else {
-			battle->SetAttackType(AttackChoice::UNDECIDED);
+			battle->ActiveHeroAttackChoice().Reset();
 		}
 	}