X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=2b22e70fcd856e124fac407f047bd682b8aa6ed8;hb=087783315ac5955c17bb3b051c9351f321653df6;hp=d7941c8e917212c58753a2b645e6b5875ebf37d1;hpb=5ca18f73987fb3935ab34654cbbecf5eca4704cb;p=l2e.git

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index d7941c8..2b22e70 100644
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -1,10 +1,3 @@
-/*
- * SelectSpell.cpp
- *
- *  Created on: Aug 8, 2012
- *      Author: holy
- */
-
 #include "SelectSpell.h"
 
 #include "SelectAttackType.h"
@@ -15,19 +8,27 @@
 #include "../../app/Input.h"
 #include "../../common/Spell.h"
 #include "../../graphics/Frame.h"
+#include "../../math/Vector.h"
 
 using app::Application;
 using app::Input;
 using common::Spell;
-using geometry::Vector;
+using math::Vector;
 using graphics::Frame;
 
 namespace battle {
 
-void SelectSpell::OnEnterState(SDL_Surface *screen) {
+SelectSpell::SelectSpell(Battle *battle, SelectAttackType *parent)
+: battle(battle)
+, parent(parent) {
 
 }
 
+
+void SelectSpell::OnEnterState(SDL_Surface *screen) {
+	OnResize(screen->w, screen->h);
+}
+
 void SelectSpell::OnExitState(SDL_Surface *screen) {
 
 }
@@ -46,7 +47,23 @@ void SelectSpell::OnPauseState(SDL_Surface *screen) {
 
 
 void SelectSpell::OnResize(int width, int height) {
+	const Vector<int> offset = parent->ScreenOffset();
+
+	const Resources &res = parent->Res();
+	const Frame &frame = *res.selectFrame;
+
+	framePosition = offset + frame.BorderSize();
+	frameSize = Vector<int>(
+			parent->Width() - 2 * frame.BorderWidth(),
+			res.normalFont->CharHeight() * 13);
+
+	headlinePosition = offset + Vector<int>(
+			2 * frame.BorderWidth() + res.normalFont->CharWidth(),
+			2 * frame.BorderHeight());
 
+	menuPosition = offset + Vector<int>(
+			2 * frame.BorderWidth() + res.normalFont->CharWidth(),
+			2 * frame.BorderHeight() + 2 * res.normalFont->CharHeight());
 }
 
 
@@ -72,7 +89,7 @@ void SelectSpell::HandleEvents(const Input &input) {
 				} else {
 					ac.Selection().SetMultiple();
 				}
-				Ctrl().PushState(new SelectTarget(battle, parent, &ac.Selection(), battle->Res().magicTargetCursor));
+				Ctrl().PushState(new SelectTarget(battle, parent, &ac.Selection(), parent->Res().magicTargetCursor));
 			}
 		}
 	}
@@ -93,40 +110,29 @@ void SelectSpell::HandleEvents(const Input &input) {
 	}
 }
 
-void SelectSpell::UpdateWorld(float deltaT) {
+void SelectSpell::UpdateWorld(Uint32 deltaT) {
 
 }
 
 void SelectSpell::Render(SDL_Surface *screen) {
 	parent->Render(screen);
-	Vector<int> offset(battle->CalculateScreenOffset(screen));
-	RenderFrame(screen, offset);
-	RenderHeadline(screen, offset);
-	RenderMenu(screen, offset);
+	RenderFrame(screen);
+	RenderHeadline(screen);
+	RenderMenu(screen);
 }
 
-void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
-	const Frame *frame(battle->Res().selectFrame);
-	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::RenderFrame(SDL_Surface *screen) {
+	const Frame &frame = *parent->Res().selectFrame;
+	frame.Draw(screen, framePosition, frameSize.X(), frameSize.Y());
 }
 
-void SelectSpell::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset) {
-	const Resources &res(battle->Res());
-	Vector<int> position(
-			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
-			2 * res.selectFrame->BorderHeight());
-	res.normalFont->DrawString(res.spellMenuHeadline, screen, position + offset);
+void SelectSpell::RenderHeadline(SDL_Surface *screen) {
+	const Resources &res = parent->Res();
+	res.normalFont->DrawString(res.spellMenuHeadline, screen, headlinePosition);
 }
 
-void SelectSpell::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
-	const Resources &res(battle->Res());
-	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);
+void SelectSpell::RenderMenu(SDL_Surface *screen) {
+	battle->ActiveHero().SpellMenu().Draw(screen, menuPosition);
 }
 
 }