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

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index b3b3e0b..1726092 100644
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -7,6 +7,11 @@
 
 #include "SelectAttackType.h"
 
+#include "SelectIkari.h"
+#include "SelectItem.h"
+#include "SelectMoveAction.h"
+#include "SelectSpell.h"
+#include "SelectTarget.h"
 #include "../AttackChoice.h"
 #include "../BattleState.h"
 #include "../../app/Application.h"
@@ -31,7 +36,14 @@ void SelectAttackType::ExitState(Application &c, SDL_Surface *screen) {
 }
 
 void SelectAttackType::ResumeState(Application &ctrl, SDL_Surface *screen) {
-
+	if (battle->ActiveHeroAttackChoice().Selection().HasSelected()) {
+		battle->ActiveHeroAttackChoice().SetType(battle->GetAttackTypeMenu().Selected());
+		battle->NextHero();
+	}
+	if (battle->AttackSelectionDone()) {
+		// pass through
+		ctrl.PopState();
+	}
 }
 
 void SelectAttackType::PauseState(Application &ctrl, SDL_Surface *screen) {
@@ -44,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)) {
@@ -58,30 +70,39 @@ 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->NextHero();
+				// TODO: detect single/multiple/all attack mode
+				battle->ActiveHeroAttackChoice().Selection().SetSingle();
+				battle->ActiveHeroAttackChoice().Selection().Reset();
+				ctrl->PushState(new SelectTarget(battle, this, &battle->ActiveHeroAttackChoice().Selection(), battle->Res().weaponTargetCursor));
 				break;
 			case AttackChoice::MAGIC:
-				// TODO: switch to spell select
-				battle->NextHero();
+				if (battle->ActiveHero().CanUseMagic()) {
+					ctrl->PushState(new SelectSpell(battle, this));
+				}
 				break;
 			case AttackChoice::DEFEND:
+				battle->ActiveHeroAttackChoice().SetType(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");
 		}
+	} else if (input.JustPressed(Input::ACTION_B)) {
+		battle->ActiveHeroAttackChoice().Reset();
+		battle->PreviousHero();
+		if (battle->BeforeFirstHero()) {
+			ctrl->ChangeState(new SelectMoveAction(battle));
+		} else {
+			battle->ActiveHeroAttackChoice().Reset();
+		}
 	}
 
 	if (battle->AttackSelectionDone()) {