X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=8c0c4da5687110eb1cf3ae574a2e0bf2ccc5ee64;hb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;hp=954b39eabf115d95bfc6a6b36e2e4be209b5f7b2;hpb=e462583cabc752b8f03b423e98e93bca5f5045d8;p=l2e.git

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 954b39e..8c0c4da 100644
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -9,79 +9,91 @@
 
 #include "SelectAttackType.h"
 #include "SelectMoveAction.h"
+#include "SelectTarget.h"
 #include "../BattleState.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
-#include "../../geometry/operators.h"
-#include "../../geometry/Point.h"
+#include "../../common/Spell.h"
 #include "../../graphics/Frame.h"
 
-#include <iostream>
-
 using app::Application;
 using app::Input;
-using geometry::Point;
-using geometry::Vector;
+using common::Spell;
+using math::Vector;
 using graphics::Frame;
 
 namespace battle {
 
-void SelectSpell::EnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
-}
+void SelectSpell::OnEnterState(SDL_Surface *screen) {
 
-void SelectSpell::ExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
 }
 
-void SelectSpell::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectSpell::OnExitState(SDL_Surface *screen) {
 
 }
 
-void SelectSpell::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectSpell::OnResumeState(SDL_Surface *screen) {
+	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
+		battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::MAGIC);
+		battle->ActiveHero().GetAttackChoice().SetSpell(battle->ActiveHero().SpellMenu().Selected());
+		Ctrl().PopState();
+	}
+}
+
+void SelectSpell::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SelectSpell::Resize(int width, int height) {
+void SelectSpell::OnResize(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();
+		if (battle->ActiveHero().SpellMenu().SelectedIsEnabled()) {
+			AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
+			const Spell *spell(battle->ActiveHero().SpellMenu().Selected());
+			ac.Selection().Reset();
+			if (spell->GetTargetingMode().TargetsAlly()) {
+				ac.Selection().SelectHeroes();
+			} else {
+				ac.Selection().SelectMonsters();
+			}
+			if (spell->GetTargetingMode().TargetsAll()) {
+				ac.SetType(AttackChoice::MAGIC);
+				ac.SetSpell(spell);
+				battle->NextHero();
+				Ctrl().PopState();
+			} else {
+				if (spell->GetTargetingMode().TargetsSingle()) {
+					ac.Selection().SetSingle();
+				} else {
+					ac.Selection().SetMultiple();
+				}
+				Ctrl().PushState(new SelectTarget(battle, parent, &ac.Selection(), battle->Res().magicTargetCursor));
+			}
 		}
 	}
 	if (input.JustPressed(Input::ACTION_B)) {
-		ctrl->PopState(); // return control to parent
+		Ctrl().PopState(); // return control to parent
 	}
 	if (input.JustPressed(Input::PAD_UP)) {
-		std::cout << "pressed up" << std::endl;
-		battle->GetSpellMenu().PreviousRow();
-		std::cout << "selected index: " << battle->GetSpellMenu().SelectedIndex() << std::endl;
+		battle->ActiveHero().SpellMenu().PreviousRow();
 	}
 	if (input.JustPressed(Input::PAD_RIGHT)) {
-		std::cout << "pressed right" << std::endl;
-		battle->GetSpellMenu().NextItem();
-		std::cout << "selected index: " << battle->GetSpellMenu().SelectedIndex() << std::endl;
+		battle->ActiveHero().SpellMenu().NextItem();
 	}
 	if (input.JustPressed(Input::PAD_DOWN)) {
-		std::cout << "pressed down" << std::endl;
-		battle->GetSpellMenu().NextRow();
-		std::cout << "selected index: " << battle->GetSpellMenu().SelectedIndex() << std::endl;
+		battle->ActiveHero().SpellMenu().NextRow();
 	}
 	if (input.JustPressed(Input::PAD_LEFT)) {
-		std::cout << "pressed left" << std::endl;
-		battle->GetSpellMenu().PreviousItem();
-		std::cout << "selected index: " << battle->GetSpellMenu().SelectedIndex() << std::endl;
+		battle->ActiveHero().SpellMenu().PreviousItem();
 	}
 }
 
-void SelectSpell::UpdateWorld(float deltaT) {
+void SelectSpell::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -95,16 +107,15 @@ void SelectSpell::Render(SDL_Surface *screen) {
 
 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);
+	Vector<int> position(frame->BorderSize());
+	int width(battle->Width() - 2 * frame->BorderWidth());
+	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(
+	Vector<int> position(
 			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
 			2 * res.selectFrame->BorderHeight());
 	res.normalFont->DrawString(res.spellMenuHeadline, screen, position + offset);
@@ -112,10 +123,10 @@ void SelectSpell::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset)
 
 void SelectSpell::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
 	const Resources &res(battle->Res());
-	Point<int> position(
+	Vector<int> position(
 			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
 			2 * res.selectFrame->BorderHeight() + 2 * res.normalFont->CharHeight());
-	battle->GetSpellMenu().Draw(screen, position + offset);
+	battle->ActiveHero().SpellMenu().Draw(screen, position + offset);
 }
 
 }