X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=d7941c8e917212c58753a2b645e6b5875ebf37d1;hb=e1edc92c4fb834c8061118e89c0d7e239742b030;hp=1bc195c12223e2a7d00b95f642da72ef3a15f19c;hpb=fde7b27297882a7f033641df92e732abd137b532;p=l2e.git

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 1bc195c..d7941c8 100644
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -14,41 +14,38 @@
 #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) {
-	ctrl = &c;
+void SelectSpell::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SelectSpell::ExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SelectSpell::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SelectSpell::ResumeState(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();
+		Ctrl().PopState();
 	}
 }
 
-void SelectSpell::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectSpell::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SelectSpell::Resize(int width, int height) {
+void SelectSpell::OnResize(int width, int height) {
 
 }
 
@@ -66,22 +63,21 @@ void SelectSpell::HandleEvents(const Input &input) {
 			}
 			if (spell->GetTargetingMode().TargetsAll()) {
 				ac.SetType(AttackChoice::MAGIC);
-				// TODO: remove item from inventory
 				ac.SetSpell(spell);
 				battle->NextHero();
-				ctrl->PopState();
+				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));
+				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)) {
 		battle->ActiveHero().SpellMenu().PreviousRow();
@@ -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,7 +123,7 @@ 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->ActiveHero().SpellMenu().Draw(screen, position + offset);