X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FStatusMenu.cpp;h=b0377033b50f1920258332595586325382a368c3;hb=b9448180c2cf0ecc75865e57d83db63d4fe3e8a5;hp=c56e796f13f5fe4fc21652657f5d7919d198674e;hpb=317100aa5878503dad034a1e1eb734d1e952f842;p=l2e.git

diff --git a/src/menu/StatusMenu.cpp b/src/menu/StatusMenu.cpp
index c56e796..b037703 100644
--- a/src/menu/StatusMenu.cpp
+++ b/src/menu/StatusMenu.cpp
@@ -85,12 +85,24 @@ void StatusMenu::Render(SDL_Surface *screen) {
 	Vector<int> equipOffset(
 			17 * parent->Res().statusFont->CharWidth(),
 			4 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
+	Vector<int> experienceOffset(
+			11 * parent->Res().statusFont->CharWidth(),
+			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);
+	Vector<int> ikariOffset(
+			17 * parent->Res().statusFont->CharWidth(),
+			17 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
 
 	parent->RenderBackground(screen);
 	parent->Res().shoulderNav->Draw(screen, offset + shoulderNavOffset);
 	RenderStatus(screen, offset + parent->StatusOffset(0));
 	RenderStats(screen, offset + statsOffset);
 	RenderEquipment(screen, offset + equipOffset);
+	RenderExperience(screen, experienceOffset);
+	RenderNextLevel(screen, nextLevelOffset);
+	RenderIkari(screen, ikariOffset);
 }
 
 int StatusMenu::Width() const {
@@ -106,7 +118,7 @@ void StatusMenu::RenderStatus(SDL_Surface *screen, const Vector<int> &offset) co
 }
 
 void StatusMenu::RenderStats(SDL_Surface *screen, const Vector<int> &offset) const {
-	const Stats &stats(parent->Game().state->party[cursor]->GetStats());
+	const Stats &stats(GetHero().GetStats());
 	Vector<int> lineBreak(0, parent->Res().statusFont->CharHeight());
 
 	Vector<int> position(offset);
@@ -140,7 +152,7 @@ void StatusMenu::RenderStatsLine(const char *label, int number, SDL_Surface *scr
 }
 
 void StatusMenu::RenderEquipment(SDL_Surface *screen, const Vector<int> &offset) const {
-	const Hero &hero(*parent->Game().state->party[cursor]);
+	const Hero &hero(GetHero());
 	Vector<int> lineBreak(0, 2 * parent->Res().statusFont->CharHeight());
 
 	Vector<int> position(offset);
@@ -175,6 +187,33 @@ void StatusMenu::RenderEquipmentLine(const Item *item, SDL_Surface *screen, cons
 	}
 }
 
+void StatusMenu::RenderExperience(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+	const Font &font(*parent->Res().statusFont);
+	font.DrawStringRight(parent->Res().experienceLabel, screen, offset, 10);
+
+	Vector<int> numberOffset(offset.X(), offset.Y() + font.CharHeight());
+	font.DrawNumberRight(GetHero().Experience(), screen, numberOffset, 7);
+}
+
+void StatusMenu::RenderNextLevel(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+	const Font &font(*parent->Res().statusFont);
+	font.DrawStringRight(parent->Res().nextLevelLabel, screen, offset, 10);
+
+	Vector<int> numberOffset(offset.X(), offset.Y() + font.CharHeight());
+	font.DrawNumberRight(GetHero().NextLevel(), screen, numberOffset, 7);
+}
+
+void StatusMenu::RenderIkari(SDL_Surface *screen, const geometry::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::NextHero() {
 	cursor = (cursor + 1) % parent->Game().state->partySize;
@@ -184,4 +223,8 @@ void StatusMenu::PreviousHero() {
 	cursor = (cursor + parent->Game().state->partySize - 1) % parent->Game().state->partySize;
 }
 
+const Hero &StatusMenu::GetHero() const {
+	return *parent->Game().state->party[cursor];
+}
+
 }