X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FStatusMenu.cpp;h=09c94050bc321ac4a49393c9fb99bf4751cd7e97;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=aea11b9cda0ffd9888b0aea38982281ed6247cc3;hpb=fab9883177573c105579a37cbc5b9bbbe69d0280;p=l2e.git

diff --git a/src/menu/StatusMenu.cpp b/src/menu/StatusMenu.cpp
index aea11b9..09c9405 100644
--- a/src/menu/StatusMenu.cpp
+++ b/src/menu/StatusMenu.cpp
@@ -1,10 +1,3 @@
-/*
- * StatusMenu.cpp
- *
- *  Created on: Oct 22, 2012
- *      Author: holy
- */
-
 #include "StatusMenu.h"
 
 #include "HeroStatus.h"
@@ -18,20 +11,24 @@
 #include "../common/Item.h"
 #include "../common/Stats.h"
 #include "../graphics/Font.h"
+#include "../graphics/Frame.h"
 
 using app::Input;
 using common::Hero;
 using common::Item;
 using common::Stats;
-using geometry::Vector;
+using math::Vector;
 using graphics::Font;
+using graphics::Frame;
 
 namespace menu {
 
 StatusMenu::StatusMenu(PartyMenu *parent, int cursor)
 : parent(parent)
-, cursor(cursor) {
-
+, cursor(cursor)
+, menu(*parent->Res().statusMenuProperties) {
+	menu.Add(parent->Res().nextLabel, 0);
+	menu.Add(parent->Res().returnLabel, 1);
 }
 
 
@@ -58,16 +55,30 @@ void StatusMenu::OnResize(int width, int height) {
 
 
 void StatusMenu::HandleEvents(const Input &input) {
-	if (input.JustPressed(Input::ACTION_B)) {
-		Ctrl().PopState();
-	}
-
 	if (input.JustPressed(Input::SHOULDER_RIGHT)) {
 		NextHero();
 	}
 	if (input.JustPressed(Input::SHOULDER_LEFT)) {
 		PreviousHero();
 	}
+
+	if (input.JustPressed(Input::PAD_LEFT)) {
+		menu.PreviousItem();
+	}
+	if (input.JustPressed(Input::PAD_RIGHT)) {
+		menu.NextItem();
+	}
+
+	if (input.JustPressed(Input::ACTION_A)) {
+		if (menu.Selected() == 0) {
+			NextHero();
+		} else if (menu.Selected() == 1) {
+			Ctrl().PopState();
+		}
+	}
+	if (input.JustPressed(Input::ACTION_B)) {
+		Ctrl().PopState();
+	}
 }
 
 void StatusMenu::UpdateWorld(float deltaT) {
@@ -90,7 +101,13 @@ void StatusMenu::Render(SDL_Surface *screen) {
 			17 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
 	Vector<int> nextLevelOffset(
 			11 * parent->Res().statusFont->CharWidth(),
-			19 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
+			20 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
+	Vector<int> ikariOffset(
+			17 * parent->Res().statusFont->CharWidth(),
+			17 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
+	Vector<int> menuOffset(
+			parent->Res().statusFont->CharWidth(),
+			23 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
 
 	parent->RenderBackground(screen);
 	parent->Res().shoulderNav->Draw(screen, offset + shoulderNavOffset);
@@ -99,6 +116,8 @@ void StatusMenu::Render(SDL_Surface *screen) {
 	RenderEquipment(screen, offset + equipOffset);
 	RenderExperience(screen, experienceOffset);
 	RenderNextLevel(screen, nextLevelOffset);
+	RenderIkari(screen, ikariOffset);
+	RenderMenu(screen, menuOffset);
 }
 
 int StatusMenu::Width() const {
@@ -152,22 +171,10 @@ void StatusMenu::RenderEquipment(SDL_Surface *screen, const Vector<int> &offset)
 	Vector<int> lineBreak(0, 2 * parent->Res().statusFont->CharHeight());
 
 	Vector<int> position(offset);
-	RenderEquipmentLine(hero.Weapon(), screen, position);
-
-	position += lineBreak;
-	RenderEquipmentLine(hero.Armor(), screen, position);
-
-	position += lineBreak;
-	RenderEquipmentLine(hero.Shield(), screen, position);
-
-	position += lineBreak;
-	RenderEquipmentLine(hero.Helmet(), screen, position);
-
-	position += lineBreak;
-	RenderEquipmentLine(hero.Ring(), screen, position);
-
-	position += lineBreak;
-	RenderEquipmentLine(hero.Jewel(), screen, position);
+	for (int i = 0; i < Hero::EQUIP_COUNT; ++i) {
+		RenderEquipmentLine(hero.Equipment(Hero::EquipSlot(i)), screen, position);
+		position += lineBreak;
+	}
 }
 
 void StatusMenu::RenderEquipmentLine(const Item *item, SDL_Surface *screen, const Vector<int> &position) const {
@@ -183,7 +190,7 @@ void StatusMenu::RenderEquipmentLine(const Item *item, SDL_Surface *screen, cons
 	}
 }
 
-void StatusMenu::RenderExperience(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void StatusMenu::RenderExperience(SDL_Surface *screen, const math::Vector<int> &offset) const {
 	const Font &font(*parent->Res().statusFont);
 	font.DrawStringRight(parent->Res().experienceLabel, screen, offset, 10);
 
@@ -191,7 +198,7 @@ void StatusMenu::RenderExperience(SDL_Surface *screen, const geometry::Vector<in
 	font.DrawNumberRight(GetHero().Experience(), screen, numberOffset, 7);
 }
 
-void StatusMenu::RenderNextLevel(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void StatusMenu::RenderNextLevel(SDL_Surface *screen, const math::Vector<int> &offset) const {
 	const Font &font(*parent->Res().statusFont);
 	font.DrawStringRight(parent->Res().nextLevelLabel, screen, offset, 10);
 
@@ -199,6 +206,31 @@ void StatusMenu::RenderNextLevel(SDL_Surface *screen, const geometry::Vector<int
 	font.DrawNumberRight(GetHero().NextLevel(), screen, numberOffset, 7);
 }
 
+void StatusMenu::RenderIkari(SDL_Surface *screen, const math::Vector<int> &offset) const {
+	const Font &font(*parent->Res().statusFont);
+	font.DrawString(parent->Res().ipLabel, screen, offset, 5);
+
+	Vector<int> numberOffset(offset.X() + 5 * font.CharWidth(), offset.Y());
+	font.DrawNumber(GetHero().RelativeIP(100), screen, numberOffset, 3);
+
+	Vector<int> percentOffset(offset.X() + 8 * font.CharWidth(), offset.Y());
+	font.DrawChar('%', screen, percentOffset);
+}
+
+void StatusMenu::RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset) const {
+	const Font &font(*parent->Res().normalFont);
+	const Frame &frame(*parent->Res().statusFrame);
+
+	Vector<int> labelOffset(2 * font.CharWidth(), font.CharHeight());
+	frame.Draw(screen, offset, 10 * font.CharWidth(), 3 * font.CharHeight());
+	font.DrawString(parent->Res().mainMenuStatusText, screen, offset + labelOffset);
+
+	Vector<int> menuFrameOffset(10 * font.CharWidth(), 0);
+	Vector<int> menuOffset(13 * font.CharWidth(), font.CharHeight());
+	frame.Draw(screen, offset + menuFrameOffset, 20 * font.CharWidth(), 3 * font.CharHeight());
+	menu.Draw(screen, offset + menuOffset);
+}
+
 
 void StatusMenu::NextHero() {
 	cursor = (cursor + 1) % parent->Game().state->partySize;