X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectAttackType.cpp;h=786277d764900f036dbfffca578d3eacfd0db114;hb=536a8c96ebfec2a2b34f680d3d0b97db8e66d599;hp=7dd06f6217b8e610f49828b891994b020ef20c1d;hpb=185c6c79f8ba30981aad4e1d66f98143a344b95e;p=l2e.git

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index 7dd06f6..786277d 100644
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -7,6 +7,8 @@
 
 #include "SelectAttackType.h"
 
+#include "SelectIkari.h"
+#include "SelectItem.h"
 #include "SelectMoveAction.h"
 #include "SelectSpell.h"
 #include "../AttackChoice.h"
@@ -63,10 +65,10 @@ void SelectAttackType::HandleInput(const Input &input) {
 	}
 
 	if (input.JustPressed(Input::ACTION_A)) {
-		battle->SetAttackType(battle->GetAttackTypeMenu().Selected());
 		switch (battle->GetAttackTypeMenu().Selected()) {
 			case AttackChoice::SWORD:
 				// TODO: switch to target select
+				battle->SetAttackType(AttackChoice::SWORD);
 				battle->NextHero();
 				break;
 			case AttackChoice::MAGIC:
@@ -75,15 +77,14 @@ void SelectAttackType::HandleInput(const Input &input) {
 				}
 				break;
 			case AttackChoice::DEFEND:
+				battle->SetAttackType(AttackChoice::DEFEND);
 				battle->NextHero();
 				break;
 			case AttackChoice::IKARI:
-				// TODO: switch to ikari attack select
-				battle->NextHero();
+				ctrl->PushState(new SelectIkari(battle, this));
 				break;
 			case AttackChoice::ITEM:
-				// TODO: switch to item select
-				battle->NextHero();
+				ctrl->PushState(new SelectItem(battle, this));
 				break;
 			default:
 				throw std::logic_error("selected invalid attack type");