X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FPartyMenu.cpp;h=46e271bd70218fc95f8d889d6b74f703f9021b2d;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=e605c193255a4b92ac92255b5fb5deadac9b1e44;hpb=17afcc24569b38a9816f616bc025ba871ad3e48e;p=l2e.git

diff --git a/src/menu/PartyMenu.cpp b/src/menu/PartyMenu.cpp
index e605c19..46e271b 100644
--- a/src/menu/PartyMenu.cpp
+++ b/src/menu/PartyMenu.cpp
@@ -1,28 +1,27 @@
-/*
- * PartyMenu.cpp
- *
- *  Created on: Oct 21, 2012
- *      Author: holy
- */
-
 #include "PartyMenu.h"
 
+#include "CapsuleMenu.h"
 #include "ChangeHero.h"
+#include "ConfigMenu.h"
+#include "EquipMenu.h"
+#include "InventoryMenu.h"
 #include "Resources.h"
+#include "ScenarioMenu.h"
 #include "SelectHero.h"
+#include "SpellMenu.h"
 #include "StatusMenu.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
 #include "../common/GameConfig.h"
 #include "../common/GameState.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
 #include "../graphics/Texture.h"
 
 using app::Input;
 using common::GameConfig;
-using geometry::Vector;
+using math::Vector;
 
 namespace menu {
 
@@ -42,7 +41,7 @@ PartyMenu::PartyMenu(GameConfig *game)
 	mainMenu.Add(Res().mainMenuStatusText, 4);
 	mainMenu.Add(Res().mainMenuSpellText, 1);
 	mainMenu.Add(Res().mainMenuChangeText, 5);
-	mainMenu.Add(Res().mainMenuCapsuleText, 2);
+	mainMenu.Add(Res().mainMenuCapsuleText, 2, game->state->capsule);
 	mainMenu.Add(Res().mainMenuConfigText, 6);
 	mainMenu.Add(Res().mainMenuEquipmentText, 3);
 	mainMenu.Add(Res().mainMenuScenarioText, 7);
@@ -94,12 +93,20 @@ void PartyMenu::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
 		switch (mainMenu.Selected()) {
 			case MENU_ITEM_ITEM:
+				Ctrl().PushState(new InventoryMenu(this));
 				break;
 			case MENU_ITEM_SPELL:
+				Ctrl().PushState(new SelectHero(this, this, this, OnSpellSelect));
 				break;
 			case MENU_ITEM_CAPSULE:
+				if (game->state->capsule) {
+					Ctrl().PushState(new CapsuleMenu(this));
+				} else {
+					// noise and blur
+				}
 				break;
 			case MENU_ITEM_EQUIP:
+				Ctrl().PushState(new SelectHero(this, this, this, OnEquipSelect));
 				break;
 			case MENU_ITEM_STATUS:
 				Ctrl().PushState(new SelectHero(this, this, this, OnStatusSelect));
@@ -108,8 +115,10 @@ void PartyMenu::HandleEvents(const Input &input) {
 				Ctrl().PushState(new ChangeHero(this));
 				break;
 			case MENU_ITEM_CONFIG:
+				Ctrl().PushState(new ConfigMenu(this));
 				break;
 			case MENU_ITEM_SCENARIO:
+				Ctrl().PushState(new ScenarioMenu(this));
 				break;
 			default:
 				break;
@@ -117,7 +126,7 @@ void PartyMenu::HandleEvents(const Input &input) {
 	}
 }
 
-void PartyMenu::UpdateWorld(float deltaT) {
+void PartyMenu::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -198,6 +207,18 @@ const Resources &PartyMenu::Res() const {
 	return *game->menuResources;
 }
 
+void PartyMenu::OnEquipSelect(void *ref, int index) {
+	PartyMenu *self(reinterpret_cast<PartyMenu *>(ref));
+	self->Ctrl().ChangeState(
+			new EquipMenu(self, index));
+}
+
+void PartyMenu::OnSpellSelect(void *ref, int index) {
+	PartyMenu *self(reinterpret_cast<PartyMenu *>(ref));
+	self->Ctrl().ChangeState(
+			new SpellMenu(self, index));
+}
+
 void PartyMenu::OnStatusSelect(void *ref, int index) {
 	PartyMenu *self(reinterpret_cast<PartyMenu *>(ref));
 	self->Ctrl().ChangeState(