X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=f50e05947a2b819d2085c5eda80363da68b65f85;hb=25d7499f7923291d7287123320e7563a367e92e7;hp=66b55f16d9dfe785a6c60ae5d54af51aaa7d0ed7;hpb=185c6c79f8ba30981aad4e1d66f98143a344b95e;p=l2e.git

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 66b55f1..f50e059 100644
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -49,12 +49,26 @@ void SelectSpell::Resize(int width, int height) {
 void SelectSpell::HandleInput(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
 		// TODO: switch to target select
-		battle->NextHero();
-		ctrl->PopState();
+		if (battle->GetSpellMenu().SelectedIsEnabled()) {
+			battle->NextHero();
+			ctrl->PopState();
+		}
 	}
 	if (input.JustPressed(Input::ACTION_B)) {
 		ctrl->PopState(); // return control to parent
 	}
+	if (input.JustPressed(Input::PAD_UP)) {
+		battle->GetSpellMenu().PreviousRow();
+	}
+	if (input.JustPressed(Input::PAD_RIGHT)) {
+		battle->GetSpellMenu().NextItem();
+	}
+	if (input.JustPressed(Input::PAD_DOWN)) {
+		battle->GetSpellMenu().NextRow();
+	}
+	if (input.JustPressed(Input::PAD_LEFT)) {
+		battle->GetSpellMenu().PreviousItem();
+	}
 }
 
 void SelectSpell::UpdateWorld(float deltaT) {
@@ -63,13 +77,34 @@ void SelectSpell::UpdateWorld(float deltaT) {
 
 void SelectSpell::Render(SDL_Surface *screen) {
 	parent->Render(screen);
-	const Frame &frame(battle->GetSelectFrame());
-	Point<int> position(frame.BorderWidth(), frame.BorderHeight());
 	Vector<int> offset(battle->CalculateScreenOffset(screen));
-	int width(battle->BackgroundWidth() - 2 * frame.BorderWidth());
-	// TODO: replace with font height
-	int height(frame.BorderHeight() * 13);
-	frame.Draw(screen, position + offset, width, height);
+	RenderFrame(screen, offset);
+	RenderHeadline(screen, offset);
+	RenderMenu(screen, offset);
+}
+
+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());
+	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(
+			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
+			2 * res.selectFrame->BorderHeight());
+	res.normalFont->DrawString(res.spellMenuHeadline, screen, position + offset);
+}
+
+void SelectSpell::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
+	const Resources &res(battle->Res());
+	Point<int> position(
+			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
+			2 * res.selectFrame->BorderHeight() + 2 * res.normalFont->CharHeight());
+	battle->GetSpellMenu().Draw(screen, position + offset);
 }
 
 }