X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectAttackType.cpp;h=7dd06f6217b8e610f49828b891994b020ef20c1d;hb=8c055cbdddac2114c130e6a6524ff887d89ccf53;hp=c7a65be7a3ade4d69d9c54895d2248d24ac587d0;hpb=2a0eca649009f78028db286a67a532429cab5b88;p=l2e.git

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index c7a65be..7dd06f6 100644
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -7,6 +7,8 @@
 
 #include "SelectAttackType.h"
 
+#include "SelectMoveAction.h"
+#include "SelectSpell.h"
 #include "../AttackChoice.h"
 #include "../BattleState.h"
 #include "../../app/Application.h"
@@ -31,7 +33,10 @@ void SelectAttackType::ExitState(Application &c, SDL_Surface *screen) {
 }
 
 void SelectAttackType::ResumeState(Application &ctrl, SDL_Surface *screen) {
-
+	if (battle->AttackSelectionDone()) {
+		// pass through
+		ctrl.PopState();
+	}
 }
 
 void SelectAttackType::PauseState(Application &ctrl, SDL_Surface *screen) {
@@ -61,23 +66,34 @@ void SelectAttackType::HandleInput(const Input &input) {
 		battle->SetAttackType(battle->GetAttackTypeMenu().Selected());
 		switch (battle->GetAttackTypeMenu().Selected()) {
 			case AttackChoice::SWORD:
+				// TODO: switch to target select
 				battle->NextHero();
 				break;
 			case AttackChoice::MAGIC:
-				// TODO: switch to spell select
+				if (battle->ActiveHero().CanUseMagic()) {
+					ctrl->PushState(new SelectSpell(battle, this));
+				}
 				break;
 			case AttackChoice::DEFEND:
 				battle->NextHero();
 				break;
 			case AttackChoice::IKARI:
 				// TODO: switch to ikari attack select
+				battle->NextHero();
 				break;
 			case AttackChoice::ITEM:
 				// TODO: switch to item select
+				battle->NextHero();
 				break;
 			default:
 				throw std::logic_error("selected invalid attack type");
 		}
+	} else if (input.JustPressed(Input::ACTION_B)) {
+		battle->SetAttackType(AttackChoice::UNDECIDED);
+		battle->PreviousHero();
+		if (battle->BeforeFirstHero()) {
+			ctrl->ChangeState(new SelectMoveAction(battle));
+		}
 	}
 
 	if (battle->AttackSelectionDone()) {
@@ -101,7 +117,7 @@ void SelectAttackType::Render(SDL_Surface *screen) {
 void SelectAttackType::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
 	Point<int> position(
 			(battle->BackgroundWidth() - battle->GetAttackTypeMenu().Width()) / 2,
-			(battle->BackgroundHeight() * 3 / 4) - (battle->GetAttackTypeMenu().Height() / 2));
+			battle->BackgroundHeight() - battle->GetAttackTypeMenu().Height() - battle->GetAttackTypeMenu().Height() / 2);
 	battle->GetAttackTypeMenu().Render(screen, position + offset);
 }