X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectItem.cpp;h=e4ccc14527d95ca4ea5bbd2665b4284195500c1c;hb=087783315ac5955c17bb3b051c9351f321653df6;hp=85ea773ce4d2420ecbbb2ecdf223585f44497358;hpb=092a2dd175a4001a495c84ee85211734fb928c83;p=l2e.git

diff --git a/src/battle/states/SelectItem.cpp b/src/battle/states/SelectItem.cpp
index 85ea773..e4ccc14 100644
--- a/src/battle/states/SelectItem.cpp
+++ b/src/battle/states/SelectItem.cpp
@@ -1,10 +1,3 @@
-/*
- * SelectItem.cpp
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #include "SelectItem.h"
 
 #include "SelectAttackType.h"
@@ -24,10 +17,17 @@ using graphics::Frame;
 
 namespace battle {
 
-void SelectItem::OnEnterState(SDL_Surface *screen) {
+SelectItem::SelectItem(Battle *battle, SelectAttackType *parent)
+: battle(battle)
+, parent(parent) {
 
 }
 
+
+void SelectItem::OnEnterState(SDL_Surface *screen) {
+	OnResize(screen->w, screen->h);
+}
+
 void SelectItem::OnExitState(SDL_Surface *screen) {
 
 }
@@ -35,7 +35,7 @@ void SelectItem::OnExitState(SDL_Surface *screen) {
 void SelectItem::OnResumeState(SDL_Surface *screen) {
 	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
 		battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::ITEM);
-		battle->ActiveHero().GetAttackChoice().SetItem(battle->ItemMenu().Selected());
+		battle->ActiveHero().GetAttackChoice().SetItem(parent->ItemMenu().Selected());
 		Ctrl().PopState();
 	}
 }
@@ -46,15 +46,31 @@ void SelectItem::OnPauseState(SDL_Surface *screen) {
 
 
 void SelectItem::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());
 }
 
 
 void SelectItem::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
-		if (battle->ItemMenu().SelectedIsEnabled()) {
+		if (parent->ItemMenu().SelectedIsEnabled()) {
 			AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
-			const Item *item(battle->ItemMenu().Selected());
+			const Item *item(parent->ItemMenu().Selected());
 			ac.Selection().Reset();
 			if (item->GetTargetingMode().TargetsAlly()) {
 				ac.Selection().SelectHeroes();
@@ -72,7 +88,7 @@ void SelectItem::HandleEvents(const Input &input) {
 				} else {
 					ac.Selection().SetMultiple();
 				}
-				Ctrl().PushState(new SelectTarget(battle, parent, &ac.Selection(), battle->Res().itemTargetCursor));
+				Ctrl().PushState(new SelectTarget(battle, parent, &ac.Selection(), parent->Res().itemTargetCursor));
 			}
 		}
 	}
@@ -80,16 +96,16 @@ void SelectItem::HandleEvents(const Input &input) {
 		Ctrl().PopState(); // return control to parent
 	}
 	if (input.JustPressed(Input::PAD_UP)) {
-		battle->ItemMenu().PreviousRow();
+		parent->ItemMenu().PreviousRow();
 	}
 	if (input.JustPressed(Input::PAD_RIGHT)) {
-		battle->ItemMenu().NextItem();
+		parent->ItemMenu().NextItem();
 	}
 	if (input.JustPressed(Input::PAD_DOWN)) {
-		battle->ItemMenu().NextRow();
+		parent->ItemMenu().NextRow();
 	}
 	if (input.JustPressed(Input::PAD_LEFT)) {
-		battle->ItemMenu().PreviousItem();
+		parent->ItemMenu().PreviousItem();
 	}
 }
 
@@ -99,34 +115,23 @@ void SelectItem::UpdateWorld(Uint32 deltaT) {
 
 void SelectItem::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 SelectItem::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 SelectItem::RenderFrame(SDL_Surface *screen) {
+	const Frame &frame = *parent->Res().selectFrame;
+	frame.Draw(screen, framePosition, frameSize.X(), frameSize.Y());
 }
 
-void SelectItem::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.itemMenuHeadline, screen, position + offset);
+void SelectItem::RenderHeadline(SDL_Surface *screen) {
+	const Resources &res = parent->Res();
+	res.normalFont->DrawString(res.itemMenuHeadline, screen, headlinePosition);
 }
 
-void SelectItem::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->ItemMenu().Draw(screen, position + offset);
+void SelectItem::RenderMenu(SDL_Surface *screen) {
+	parent->ItemMenu().Draw(screen, menuPosition);
 }
 
 }