added experience display in status screen

diff --git a/src/main.cpp b/src/main.cpp
index 1587d60c34223b7f5beb00bd4c3e2293f4027582..69b4e870b40aadbec2c059130ff1b39f74fb9b9a 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -336,6 +336,10 @@ int main(int argc, char **argv) {
                menuResources.gutLabel = "GUT";
                menuResources.mgrLabel = "MGR";
 
+               menuResources.ipLabel = "IP";
+               menuResources.experienceLabel = "NOW EXP";
+               menuResources.nextLevelLabel = "NEXT LEVEL";
+
                InitScreen screen(width, height);
 
                app::State *state(0);

diff --git a/src/menu/Resources.cpp b/src/menu/Resources.cpp
index 79e59515b9ab905861e9840954890cf01837987e..646c049c8dbbf6c3713f1c256d1ca8b51bcc2b1f 100644 (file)
--- a/src/menu/Resources.cpp
+++ b/src/menu/Resources.cpp
@@ -43,7 +43,11 @@ Resources::Resources()
 , aglLabel(0)
 , intLabel(0)
 , gutLabel(0)
-, mgrLabel(0) {
+, mgrLabel(0)
+
+, ipLabel(0)
+, experienceLabel(0)
+, nextLevelLabel(0) {
 
 }
 

diff --git a/src/menu/Resources.h b/src/menu/Resources.h
index 0b3b435f7019e80dc8e1f4f860c7ed9ce3bab1de..64198f85c158fe61387ff075c4f87ac22a7a5906 100644 (file)
--- a/src/menu/Resources.h
+++ b/src/menu/Resources.h
@@ -50,6 +50,10 @@ struct Resources {
        const char *gutLabel;
        const char *mgrLabel;
 
+       const char *ipLabel;
+       const char *experienceLabel;
+       const char *nextLevelLabel;
+
        Resources();
 
 };

diff --git a/src/menu/StatusMenu.cpp b/src/menu/StatusMenu.cpp
index c56e796f13f5fe4fc21652657f5d7919d198674e..f155c160b1fb71ab85d5a16a2be42956a7398b41 100644 (file)
--- a/src/menu/StatusMenu.cpp
+++ b/src/menu/StatusMenu.cpp
@@ -85,12 +85,16 @@ 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);
 
        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);
 }
 
 int StatusMenu::Width() const {
@@ -106,7 +110,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 +144,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 +179,14 @@ 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::NextHero() {
        cursor = (cursor + 1) % parent->Game().state->partySize;
@@ -184,4 +196,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];
+}
+
 }

diff --git a/src/menu/StatusMenu.h b/src/menu/StatusMenu.h
index 61082d4d95903d94b21413a6ba2f14c1854d3612..51c169ac5cd4b50fd9343419c6456dd00ef96da3 100644 (file)
--- a/src/menu/StatusMenu.h
+++ b/src/menu/StatusMenu.h
@@ -41,11 +41,15 @@ private:
        void NextHero();
        void PreviousHero();
 
+       const common::Hero &GetHero() const;
+
        void RenderStatus(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
        void RenderStats(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
        void RenderStatsLine(const char *label, int number, SDL_Surface *screen, const geometry::Vector<int> &position) const;
        void RenderEquipment(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
        void RenderEquipmentLine(const common::Item *, SDL_Surface *screen, const geometry::Vector<int> &position) const;
+       /// @param offset the top right corner!
+       void RenderExperience(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
 
 private:
        PartyMenu *parent;