X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=db5bb45981c723727758a85968c9f8cfe947c01d;hb=d872d756e64b8f1f57cba64ae19f479f8eab3927;hp=5f358fbe45c031f2420749654f97885941e29c8b;hpb=8c055cbdddac2114c130e6a6524ff887d89ccf53;p=l2e.git

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 5f358fb..db5bb45 100644
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -49,12 +49,27 @@ 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->SetAttackType(AttackChoice::MAGIC);
+			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) {
@@ -65,6 +80,7 @@ void SelectSpell::Render(SDL_Surface *screen) {
 	parent->Render(screen);
 	Vector<int> offset(battle->CalculateScreenOffset(screen));
 	RenderFrame(screen, offset);
+	RenderHeadline(screen, offset);
 	RenderMenu(screen, offset);
 }
 
@@ -72,13 +88,23 @@ 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());
-	// TODO: replace with font height
-	int height(frame->BorderHeight() * 13);
+	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) {
-	Point<int> position(2 * battle->Res().selectFrame->BorderWidth(), 2 * battle->Res().selectFrame->BorderHeight());
+	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);
 }