X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=a9c06cceccc912ca59e3530ce361e52b7fbb2880;hb=222167ba3722dc7f47ff7510006bd516e0010a50;hp=5f358fbe45c031f2420749654f97885941e29c8b;hpb=8c055cbdddac2114c130e6a6524ff887d89ccf53;p=l2e.git

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 5f358fb..a9c06cc 100644
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -9,15 +9,18 @@
 
 #include "SelectAttackType.h"
 #include "SelectMoveAction.h"
+#include "SelectTarget.h"
 #include "../BattleState.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
+#include "../../common/Spell.h"
 #include "../../geometry/operators.h"
 #include "../../geometry/Point.h"
 #include "../../graphics/Frame.h"
 
 using app::Application;
 using app::Input;
+using common::Spell;
 using geometry::Point;
 using geometry::Vector;
 using graphics::Frame;
@@ -33,7 +36,11 @@ void SelectSpell::ExitState(Application &c, SDL_Surface *screen) {
 }
 
 void SelectSpell::ResumeState(Application &ctrl, SDL_Surface *screen) {
-
+	if (battle->ActiveHeroTargets().HasSelected()) {
+		battle->SetAttackType(AttackChoice::MAGIC);
+		battle->ActiveHeroAttackChoice().SetSpell(battle->GetSpellMenu().Selected());
+		ctrl.PopState();
+	}
 }
 
 void SelectSpell::PauseState(Application &ctrl, SDL_Surface *screen) {
@@ -46,15 +53,47 @@ void SelectSpell::Resize(int width, int height) {
 }
 
 
-void SelectSpell::HandleInput(const Input &input) {
+void SelectSpell::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
-		// TODO: switch to target select
-		battle->NextHero();
-		ctrl->PopState();
+		if (battle->GetSpellMenu().SelectedIsEnabled()) {
+			const Spell *spell(battle->GetSpellMenu().Selected());
+			battle->ActiveHeroTargets().Reset();
+			if (spell->GetTargetingMode().TargetsAlly()) {
+				battle->ActiveHeroTargets().SelectHeroes();
+			} else {
+				battle->ActiveHeroTargets().SelectEnemies();
+			}
+			if (spell->GetTargetingMode().TargetsAll()) {
+				battle->SetAttackType(AttackChoice::MAGIC);
+				// TODO: remove item from inventory
+				battle->ActiveHeroAttackChoice().SetSpell(spell);
+				battle->NextHero();
+				ctrl->PopState();
+			} else {
+				if (spell->GetTargetingMode().TargetsSingle()) {
+					battle->ActiveHeroTargets().SetSingle();
+				} else {
+					battle->ActiveHeroTargets().SetMultiple();
+				}
+				ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroTargets(), battle->Res().magicTargetCursor));
+			}
+		}
 	}
 	if (input.JustPressed(Input::ACTION_B)) {
 		ctrl->PopState(); // return control to parent
 	}
+	if (input.JustPressed(Input::PAD_UP)) {
+		battle->GetSpellMenu().PreviousRow();
+	}
+	if (input.JustPressed(Input::PAD_RIGHT)) {
+		battle->GetSpellMenu().NextItem();
+	}
+	if (input.JustPressed(Input::PAD_DOWN)) {
+		battle->GetSpellMenu().NextRow();
+	}
+	if (input.JustPressed(Input::PAD_LEFT)) {
+		battle->GetSpellMenu().PreviousItem();
+	}
 }
 
 void SelectSpell::UpdateWorld(float deltaT) {
@@ -65,6 +104,7 @@ void SelectSpell::Render(SDL_Surface *screen) {
 	parent->Render(screen);
 	Vector<int> offset(battle->CalculateScreenOffset(screen));
 	RenderFrame(screen, offset);
+	RenderHeadline(screen, offset);
 	RenderMenu(screen, offset);
 }
 
@@ -72,13 +112,23 @@ void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
 	const Frame *frame(battle->Res().selectFrame);
 	Point<int> position(frame->BorderWidth(), frame->BorderHeight());
 	int width(battle->BackgroundWidth() - 2 * frame->BorderWidth());
-	// TODO: replace with font height
-	int height(frame->BorderHeight() * 13);
+	int height(battle->Res().normalFont->CharHeight() * 13);
 	frame->Draw(screen, position + offset, width, height);
 }
 
+void SelectSpell::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset) {
+	const Resources &res(battle->Res());
+	Point<int> position(
+			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
+			2 * res.selectFrame->BorderHeight());
+	res.normalFont->DrawString(res.spellMenuHeadline, screen, position + offset);
+}
+
 void SelectSpell::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
-	Point<int> position(2 * battle->Res().selectFrame->BorderWidth(), 2 * battle->Res().selectFrame->BorderHeight());
+	const Resources &res(battle->Res());
+	Point<int> position(
+			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
+			2 * res.selectFrame->BorderHeight() + 2 * res.normalFont->CharHeight());
 	battle->GetSpellMenu().Draw(screen, position + offset);
 }