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

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index be5c610..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,12 +53,30 @@ 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
 		if (battle->GetSpellMenu().SelectedIsEnabled()) {
-			battle->NextHero();
-			ctrl->PopState();
+			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)) {
@@ -87,8 +112,7 @@ 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);
 }