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

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 3b4573f..6ea4675 100644
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -14,59 +14,55 @@
 #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) {
+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->GetSpellMenu().Selected());
+		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()) {
+		if (battle->ActiveHero().SpellMenu().SelectedIsEnabled()) {
 			AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
-			const Spell *spell(battle->GetSpellMenu().Selected());
+			const Spell *spell(battle->ActiveHero().SpellMenu().Selected());
 			ac.Selection().Reset();
 			if (spell->GetTargetingMode().TargetsAlly()) {
 				ac.Selection().SelectHeroes();
 			} else {
-				ac.Selection().SelectEnemies();
+				ac.Selection().SelectMonsters();
 			}
 			if (spell->GetTargetingMode().TargetsAll()) {
 				ac.SetType(AttackChoice::MAGIC);
-				// TODO: remove item from inventory
 				ac.SetSpell(spell);
 				battle->NextHero();
 				ctrl->PopState();
@@ -84,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();
 	}
 }
 
@@ -111,7 +107,7 @@ 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());
+	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);
@@ -119,7 +115,7 @@ void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
 
 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);
@@ -127,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);
 }
 
 }