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

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index a9c06cc..6ea4675 100644
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -14,68 +14,65 @@
 #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;
 
 namespace battle {
 
-void SelectSpell::EnterState(Application &c, SDL_Surface *screen) {
+void SelectSpell::OnEnterState(Application &c, SDL_Surface *screen) {
 	ctrl = &c;
 }
 
-void SelectSpell::ExitState(Application &c, SDL_Surface *screen) {
+void SelectSpell::OnExitState(Application &c, SDL_Surface *screen) {
 	ctrl = 0;
 }
 
-void SelectSpell::ResumeState(Application &ctrl, SDL_Surface *screen) {
-	if (battle->ActiveHeroTargets().HasSelected()) {
-		battle->SetAttackType(AttackChoice::MAGIC);
-		battle->ActiveHeroAttackChoice().SetSpell(battle->GetSpellMenu().Selected());
+void SelectSpell::OnResumeState(Application &ctrl, 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::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectSpell::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
 
-void SelectSpell::Resize(int width, int height) {
+void SelectSpell::OnResize(int width, int height) {
 
 }
 
 
 void SelectSpell::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
-		if (battle->GetSpellMenu().SelectedIsEnabled()) {
-			const Spell *spell(battle->GetSpellMenu().Selected());
-			battle->ActiveHeroTargets().Reset();
+		if (battle->ActiveHero().SpellMenu().SelectedIsEnabled()) {
+			AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
+			const Spell *spell(battle->ActiveHero().SpellMenu().Selected());
+			ac.Selection().Reset();
 			if (spell->GetTargetingMode().TargetsAlly()) {
-				battle->ActiveHeroTargets().SelectHeroes();
+				ac.Selection().SelectHeroes();
 			} else {
-				battle->ActiveHeroTargets().SelectEnemies();
+				ac.Selection().SelectMonsters();
 			}
 			if (spell->GetTargetingMode().TargetsAll()) {
-				battle->SetAttackType(AttackChoice::MAGIC);
-				// TODO: remove item from inventory
-				battle->ActiveHeroAttackChoice().SetSpell(spell);
+				ac.SetType(AttackChoice::MAGIC);
+				ac.SetSpell(spell);
 				battle->NextHero();
 				ctrl->PopState();
 			} else {
 				if (spell->GetTargetingMode().TargetsSingle()) {
-					battle->ActiveHeroTargets().SetSingle();
+					ac.Selection().SetSingle();
 				} else {
-					battle->ActiveHeroTargets().SetMultiple();
+					ac.Selection().SetMultiple();
 				}
-				ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroTargets(), battle->Res().magicTargetCursor));
+				ctrl->PushState(new SelectTarget(battle, parent, &ac.Selection(), battle->Res().magicTargetCursor));
 			}
 		}
 	}
@@ -83,16 +80,16 @@ void SelectSpell::HandleEvents(const Input &input) {
 		ctrl->PopState(); // return control to parent
 	}
 	if (input.JustPressed(Input::PAD_UP)) {
-		battle->GetSpellMenu().PreviousRow();
+		battle->ActiveHero().SpellMenu().PreviousRow();
 	}
 	if (input.JustPressed(Input::PAD_RIGHT)) {
-		battle->GetSpellMenu().NextItem();
+		battle->ActiveHero().SpellMenu().NextItem();
 	}
 	if (input.JustPressed(Input::PAD_DOWN)) {
-		battle->GetSpellMenu().NextRow();
+		battle->ActiveHero().SpellMenu().NextRow();
 	}
 	if (input.JustPressed(Input::PAD_LEFT)) {
-		battle->GetSpellMenu().PreviousItem();
+		battle->ActiveHero().SpellMenu().PreviousItem();
 	}
 }
 
@@ -110,15 +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());
+	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);
@@ -126,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);
 }
 
 }