X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FPartyMenu.cpp;h=79b2be06d7dc436c27d9be5d264ef77a639fad86;hb=9429393ba3d875a12049dc9efeb4720fd9583e23;hp=5a68ca4fa5c3eac66b39055f18d28e861b29f2e6;hpb=aedf4ae020e3c811341df79ceae63ca56fb7ce83;p=l2e.git

diff --git a/src/menu/PartyMenu.cpp b/src/menu/PartyMenu.cpp
index 5a68ca4..79b2be0 100644
--- a/src/menu/PartyMenu.cpp
+++ b/src/menu/PartyMenu.cpp
@@ -8,6 +8,8 @@
 #include "PartyMenu.h"
 
 #include "Resources.h"
+#include "SelectHero.h"
+#include "StatusMenu.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
 #include "../common/GameConfig.h"
@@ -30,9 +32,10 @@ PartyMenu::PartyMenu(GameConfig *game)
 		status[i].SetHero(game->state->party[i]);
 		status[i].SetResources(game->menuResources);
 	}
-	status[1].SetPosition(Vector<int>(status[0].Width() + Res().normalFont->CharWidth(), 0));
-	status[2].SetPosition(Vector<int>(0, status[0].Height() + Res().normalFont->CharHeight()));
-	status[3].SetPosition(Vector<int>(status[0].Width() + Res().normalFont->CharWidth(), status[0].Height() + Res().normalFont->CharHeight()));
+	statusPositions[0] = Vector<int>(0, 0);
+	statusPositions[1] = Vector<int>(status[0].Width(), 0);
+	statusPositions[2] = Vector<int>(0, status[0].Height());
+	statusPositions[3] = Vector<int>(status[0].Width(), status[0].Height());
 
 	mainMenu.Add(Res().mainMenuItemText, 0);
 	mainMenu.Add(Res().mainMenuStatusText, 4);
@@ -86,6 +89,30 @@ void PartyMenu::HandleEvents(const Input &input) {
 	} else if (input.JustPressed(Input::PAD_LEFT)) {
 		mainMenu.PreviousItem();
 	}
+
+	if (input.JustPressed(Input::ACTION_A)) {
+		switch (mainMenu.Selected()) {
+			case MENU_ITEM_ITEM:
+				break;
+			case MENU_ITEM_SPELL:
+				break;
+			case MENU_ITEM_CAPSULE:
+				break;
+			case MENU_ITEM_EQUIP:
+				break;
+			case MENU_ITEM_STATUS:
+				Ctrl().PushState(new SelectHero(this, OnStatusSelect));
+				break;
+			case MENU_ITEM_CHANGE:
+				break;
+			case MENU_ITEM_CONFIG:
+				break;
+			case MENU_ITEM_SCENARIO:
+				break;
+			default:
+				break;
+		}
+	}
 }
 
 void PartyMenu::UpdateWorld(float deltaT) {
@@ -93,18 +120,41 @@ void PartyMenu::UpdateWorld(float deltaT) {
 }
 
 void PartyMenu::Render(SDL_Surface *screen) {
+	Vector<int> offset((screen->w - Width()) / 2, (screen->h - Height()) / 2);
+
+	RenderBackground(screen);
+	RenderHeros(screen, offset);
+	RenderMenu(screen, offset + Vector<int>(8 * Res().normalFont->CharWidth(), 13 * Res().normalFont->CharHeight() + Res().normalFont->CharHeight() / 8));
+	RenderInfo(screen, offset + Vector<int>(14 * Res().normalFont->CharWidth(), 21 * Res().normalFont->CharHeight() + Res().normalFont->CharHeight() / 8));
+}
+
+int PartyMenu::Width() const {
+	return 2 * (status[0].Width() + Res().normalFont->CharWidth());
+}
+
+int PartyMenu::Height() const {
+	return 2 * Res().normalFont->CharHeight()
+			+ 2 * status[0].Height()
+			+ Res().normalFont->CharHeight()
+			+ 8 * Res().normalFont->CharHeight()
+			+ 5 * Res().normalFont->CharHeight()
+			+ 2 * Res().normalFont->CharHeight();
+}
+
+void PartyMenu::RenderBackground(SDL_Surface *screen) const {
 	Res().menubg->Render(screen, Vector<int>(), Vector<int>(screen->w, screen->h));
-	RenderHeros(screen, Vector<int>(Res().normalFont->CharWidth(), 2 * Res().normalFont->CharHeight()));
-	RenderMenu(screen, Vector<int>(8 * Res().normalFont->CharWidth(), 13 * Res().normalFont->CharHeight() + Res().normalFont->CharHeight() / 8));
-	RenderInfo(screen, Vector<int>(14 * Res().normalFont->CharWidth(), 21 * Res().normalFont->CharHeight() + Res().normalFont->CharHeight() / 8));
 }
 
 void PartyMenu::RenderHeros(SDL_Surface *screen, const Vector<int> &offset) const {
 	for (int i(0); i < 4; ++i) {
-		status[i].Render(screen, offset);
+		status[i].Render(screen, offset + StatusOffset(i));
 	}
 }
 
+Vector<int> PartyMenu::StatusOffset(int index) const {
+	return statusPositions[index] + Vector<int>(Res().normalFont->CharWidth(), 2 * Res().normalFont->CharHeight());
+}
+
 void PartyMenu::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) const {
 	Vector<int> menuOffset(3 * Res().normalFont->CharWidth(), Res().normalFont->CharHeight() + Res().normalFont->CharHeight() / 4);
 
@@ -146,4 +196,8 @@ const Resources &PartyMenu::Res() const {
 	return *game->menuResources;
 }
 
+void PartyMenu::OnStatusSelect(PartyMenu *self, int index) {
+	self->Ctrl().ChangeState(new StatusMenu(self, index));
+}
+
 }