added equipment in stats screen

diff --git a/src/main.cpp b/src/main.cpp
index 7cb7bd24de3fee8911b05443fa5df7ce36c0a1d1..93727fda784fd4da6a4914d131b81c34db0c2959 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -323,6 +323,11 @@ int main(int argc, char **argv) {
                menuResources.heroCursor = &heroCursor;
                menuResources.heroCursorBlinkTime = 532;
 
+               menuResources.noEquipmentText = "No equip";
+
+               graphics::Sprite shoulderNav(IMG_Load("test-data/shoulder-nav.png"), 160, 16);
+               menuResources.shoulderNav = &shoulderNav;
+
                InitScreen screen(width, height);
 
                app::State *state(0);

diff --git a/src/menu/HeroStatus.cpp b/src/menu/HeroStatus.cpp
index 6f8b341c6a754a4facbe628a15c2ea1902aa9107..2d038b1a3c69b247f661b4fe807c72c2a8ee5def 100644 (file)
--- a/src/menu/HeroStatus.cpp
+++ b/src/menu/HeroStatus.cpp
@@ -28,24 +28,24 @@ HeroStatus::~HeroStatus() {
 
 
 int HeroStatus::Width() const {
-       return hero->BattleSprite()->Width() + res->statusFont->CharWidth() * 10;
+       return hero->BattleSprite()->Width() + res->statusFont->CharWidth() * 11;
 }
 
 int HeroStatus::Height() const {
-       return hero->BattleSprite()->Height();
+       return hero->BattleSprite()->Height() + res->statusFont->CharWidth();
 }
 
 
 void HeroStatus::Render(SDL_Surface *screen, const Vector<int> &offset) const {
        if (!hero) return;
 
-       hero->BattleSprite()->Draw(screen, position + offset, 0, 0);
+       hero->BattleSprite()->Draw(screen, offset, 0, 0);
 
        // for some reason, fonts are shifted by one pixel in the original
        Vector<int> nameOffset(
                        hero->BattleSprite()->Width(),
                        res->statusFont->CharHeight() * 7 / 8);
-       nameOffset += position + offset;
+       nameOffset += offset;
        res->statusFont->DrawString(hero->Name(), screen, nameOffset, 5);
 
        Vector<int> levelLabelOffset(nameOffset.X() + 6 * res->statusFont->CharWidth(), nameOffset.Y());

diff --git a/src/menu/HeroStatus.h b/src/menu/HeroStatus.h
index 12fe62f05cde32c0ee68e0cbf2c97cd3746f650f..2888b1555bb7d4f5f521c36d5bc446feec719090 100644 (file)
--- a/src/menu/HeroStatus.h
+++ b/src/menu/HeroStatus.h
@@ -25,19 +25,16 @@ public:
 public:
        void SetResources(const Resources *r) { res = r; }
        void SetHero(const common::Hero *h) { hero = h; }
-       void SetPosition(const geometry::Vector<int> &p) { position = p; }
 
        int Width() const;
        int Height() const;
        geometry::Vector<int> Size() const { return geometry::Vector<int>(Width(), Height()); }
-       const geometry::Vector<int> &Position() const { return position; }
 
        void Render(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
 
 private:
        const Resources *res;
        const common::Hero *hero;
-       geometry::Vector<int> position;
 
 };
 

diff --git a/src/menu/PartyMenu.cpp b/src/menu/PartyMenu.cpp
index 85d19d2064456b74e44e63ce988253672b952ead..79b2be06d7dc436c27d9be5d264ef77a639fad86 100644 (file)
--- a/src/menu/PartyMenu.cpp
+++ b/src/menu/PartyMenu.cpp
@@ -32,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);
@@ -119,14 +120,25 @@ 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, StatusOffset());
-       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));
+       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());
 }
 
-Vector<int> PartyMenu::StatusOffset() const {
-       return Vector<int>(Res().normalFont->CharWidth(), 2 * Res().normalFont->CharHeight());
+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 {
@@ -135,10 +147,14 @@ void PartyMenu::RenderBackground(SDL_Surface *screen) const {
 
 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);
 
@@ -181,7 +197,7 @@ const Resources &PartyMenu::Res() const {
 }
 
 void PartyMenu::OnStatusSelect(PartyMenu *self, int index) {
-       self->Ctrl().ChangeState(new StatusMenu(self));
+       self->Ctrl().ChangeState(new StatusMenu(self, index));
 }
 
 }

diff --git a/src/menu/PartyMenu.h b/src/menu/PartyMenu.h
index a55b2c13f81fadeaf8071e832b4edffb5c950fdf..d7edf31f3c335a4ecf300a6d7535890a79731fad 100644 (file)
--- a/src/menu/PartyMenu.h
+++ b/src/menu/PartyMenu.h
@@ -35,13 +35,16 @@ public:
        Resources &Res();
        const Resources &Res() const;
 
+       int Width() const;
+       int Height() const;
+
 public:
        void RenderBackground(SDL_Surface *screen) const;
        void RenderHeros(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
        void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
        void RenderInfo(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
 
-       geometry::Vector<int> StatusOffset() const;
+       geometry::Vector<int> StatusOffset(int index) const;
        const HeroStatus &GetHeroStatus(int index) const { return status[index]; }
 
        static void OnStatusSelect(PartyMenu *, int);
@@ -68,6 +71,7 @@ private:
 
 private:
        HeroStatus status[4];
+       geometry::Vector<int> statusPositions[4];
        common::GameConfig *game;
        graphics::Menu<int> mainMenu;
 

diff --git a/src/menu/Resources.cpp b/src/menu/Resources.cpp
index 79342b249333f40db462da452dc799071160812e..166fbf70368f15a42dd8eac25a9d66184db5bfe1 100644 (file)
--- a/src/menu/Resources.cpp
+++ b/src/menu/Resources.cpp
@@ -31,7 +31,11 @@ Resources::Resources()
 , mainMenuGoldText(0)
 
 , heroCursor(0)
-, heroCursorBlinkTime(0) {
+, heroCursorBlinkTime(0)
+
+, noEquipmentText(0)
+
+, shoulderNav(0) {
 
 }
 

diff --git a/src/menu/Resources.h b/src/menu/Resources.h
index e5241c33d8f3ac95353a80f7951040a5334ee404..eb6181658eec266ae7185883e1698e97c7892db6 100644 (file)
--- a/src/menu/Resources.h
+++ b/src/menu/Resources.h
@@ -38,6 +38,10 @@ struct Resources {
        graphics::Sprite *heroCursor;
        int heroCursorBlinkTime;
 
+       const char *noEquipmentText;
+
+       graphics::Sprite *shoulderNav;
+
        Resources();
 
 };

diff --git a/src/menu/SelectHero.cpp b/src/menu/SelectHero.cpp
index 723414ff95164d051c6d5a93c3e5eb7ba4b257a1..74e6f88ad9fd1a67310c653da7402dfb0f6e1dfc 100644 (file)
--- a/src/menu/SelectHero.cpp
+++ b/src/menu/SelectHero.cpp
@@ -123,10 +123,9 @@ void SelectHero::Render(SDL_Surface *screen) {
 }
 
 void SelectHero::RenderCursor(SDL_Surface *screen) const {
-       const HeroStatus &status(parent->GetHeroStatus(cursor));
        Vector<int> position(
                        0, Game().state->party[cursor]->BattleSprite()->Height());
-       position += status.Position() + parent->StatusOffset();
+       position += parent->StatusOffset(cursor);
        Res().heroCursor->Draw(screen, position);
 }
 

diff --git a/src/menu/StatusMenu.cpp b/src/menu/StatusMenu.cpp
index efc807feed4e9e14787a49e3acad8b967aacdb7c..e46a1dd1fbc9d2f11d36d4399286af0cc6a8e200 100644 (file)
--- a/src/menu/StatusMenu.cpp
+++ b/src/menu/StatusMenu.cpp
@@ -7,16 +7,28 @@
 
 #include "StatusMenu.h"
 
+#include "HeroStatus.h"
 #include "PartyMenu.h"
+#include "Resources.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
+#include "../common/GameConfig.h"
+#include "../common/GameState.h"
+#include "../common/Hero.h"
+#include "../common/Item.h"
+#include "../graphics/Font.h"
 
 using app::Input;
+using common::Hero;
+using common::Item;
+using geometry::Vector;
+using graphics::Font;
 
 namespace menu {
 
-StatusMenu::StatusMenu(PartyMenu *parent)
-: parent(parent) {
+StatusMenu::StatusMenu(PartyMenu *parent, int cursor)
+: parent(parent)
+, cursor(cursor) {
 
 }
 
@@ -47,6 +59,13 @@ 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();
+       }
 }
 
 void StatusMenu::UpdateWorld(float deltaT) {
@@ -54,7 +73,75 @@ void StatusMenu::UpdateWorld(float deltaT) {
 }
 
 void StatusMenu::Render(SDL_Surface *screen) {
+       Vector<int> offset((screen->w - Width()) / 2, (screen->h - Height()) / 2);
+       Vector<int> shoulderNavOffset(
+                       5 * parent->Res().statusFont->CharWidth(),
+                       parent->Res().statusFont->CharHeight());
+       Vector<int> statsOffset(
+                       17 * parent->Res().statusFont->CharWidth(),
+                       4 * 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));
+       RenderEquipment(screen, offset + statsOffset);
+}
+
+int StatusMenu::Width() const {
+       return parent->Width();
+}
+
+int StatusMenu::Height() const {
+       return parent->Height();
+}
+
+void StatusMenu::RenderStatus(SDL_Surface *screen, const Vector<int> &offset) const {
+       parent->GetHeroStatus(cursor).Render(screen, offset);
+}
+
+void StatusMenu::RenderEquipment(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+       const Hero &hero(*parent->Game().state->party[cursor]);
+       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);
+}
+
+void StatusMenu::RenderEquipmentLine(const Item *item, SDL_Surface *screen, const Vector<int> &position) const {
+       const Font &font(*parent->Res().statusFont);
+       const Vector<int> textOffset(font.CharWidth(), 0);
+       if (item) {
+               if (item->MenuIcon()) {
+                       item->MenuIcon()->Draw(screen, position);
+               }
+               font.DrawString(item->Name(), screen, position + textOffset);
+       } else {
+               font.DrawString(parent->Res().noEquipmentText, screen, position + textOffset);
+       }
+}
+
+
+void StatusMenu::NextHero() {
+       cursor = (cursor + 1) % parent->Game().state->partySize;
+}
+
+void StatusMenu::PreviousHero() {
+       cursor = (cursor + parent->Game().state->partySize - 1) % parent->Game().state->partySize;
 }
 
 }

diff --git a/src/menu/StatusMenu.h b/src/menu/StatusMenu.h
index 465c7c41bc7eb74e78e9934fe2944d4349316bb2..4330b99662219db731291e386a3799a05975c13f 100644 (file)
--- a/src/menu/StatusMenu.h
+++ b/src/menu/StatusMenu.h
@@ -10,6 +10,8 @@
 
 #include "fwd.h"
 #include "../app/State.h"
+#include "../common/fwd.h"
+#include "../geometry/Vector.h"
 
 namespace menu {
 
@@ -17,13 +19,17 @@ class StatusMenu
 : public app::State {
 
 public:
-       explicit StatusMenu(PartyMenu *parent);
+       StatusMenu(PartyMenu *parent, int heroIndex);
 
 public:
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);
        virtual void Render(SDL_Surface *);
 
+public:
+       int Width() const;
+       int Height() const;
+
 private:
        virtual void OnEnterState(SDL_Surface *screen);
        virtual void OnExitState(SDL_Surface *screen);
@@ -32,8 +38,16 @@ private:
 
        virtual void OnResize(int width, int height);
 
+       void NextHero();
+       void PreviousHero();
+
+       void RenderStatus(SDL_Surface *screen, const geometry::Vector<int> &offset) 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;
+
 private:
        PartyMenu *parent;
+       int cursor;
 
 };
 

diff --git a/test-data/shoulder-nav.png b/test-data/shoulder-nav.png
new file mode 100644 (file)
index 0000000..54edbe6
Binary files /dev/null and b/test-data/shoulder-nav.png differ