reworked Menu to include an optional number

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 58f29659e7c4500656b5c70f1faf5595e3e14b8c..ec56169a1b261f87dd6d2172fbb947b2954e9e25 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -16,9 +16,7 @@
 #include "../geometry/operators.h"
 #include "../graphics/Sprite.h"
 
-#include <iomanip>
 #include <stdexcept>
-#include <sstream>
 
 using app::Application;
 using app::Input;
@@ -72,21 +70,12 @@ void BattleState::LoadInventory() {
        const Inventory &inv(*res->inventory);
        itemMenu.Clear();
        itemMenu.Reserve(inv.MaxItems());
-       itemMenuStrings.clear();
-       itemMenuStrings.resize(inv.MaxItems());
-       int itemNameLength(itemMenu.CharsPerEntry() - 3);
-       // TODO: better (maybe intrusive) solution for menus with counts
        for (int i(0); i < inv.MaxItems(); ++i) {
                const Item *item(inv.ItemAt(i));
                if (item) {
-                       std::stringstream s;
-                       s << std::setw(itemNameLength) << std::left << std::setfill(' ') << item->Name();
-                       s << ':';
-                       s << inv.ItemCountAt(i);
-                       itemMenuStrings[i] = s.str();
-                       itemMenu.Add(itemMenuStrings[i].c_str(), item, item->CanUseInBattle(), item->MenuIcon());
+                       itemMenu.Add(item->Name(), item, item->CanUseInBattle(), item->MenuIcon(), inv.ItemCountAt(i));
                } else {
-                       itemMenu.Add("", 0, false);
+                       itemMenu.AddEmptyEntry();
                }
        }
 }

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 4b0ffcff43c591f41f754b62e3f983208ef1479c..96a7ce20643d5b62f4aee3d3c9f0f68103280a3a 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -21,7 +21,6 @@
 #include "../graphics/Menu.h"
 
 #include <vector>
-#include <string>
 #include <SDL.h>
 
 namespace app { class Input; }
@@ -120,7 +119,6 @@ private:
        std::vector<Hero> heroes;
        std::vector<graphics::Menu</* Spell */ void *> > spellMenus;
        graphics::Menu<const common::Item *> itemMenu;
-       std::vector<std::string> itemMenuStrings;
        std::vector<graphics::Menu</* Ikari or Item */ void *> > ikariMenus;
        std::vector<HeroTag> heroTags;
        std::vector<AttackChoice> attackChoices;

diff --git a/src/graphics/Menu.h b/src/graphics/Menu.h
index 1cdddcdb01467cb752ebc979913a55a7fd03a34e..26b9d0527033484ee594f72d7342b816b2d46898 100644 (file)
--- a/src/graphics/Menu.h
+++ b/src/graphics/Menu.h
@@ -27,18 +27,19 @@ class Menu {
 
 public:
        Menu();
-       Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap = 0, int iconSpace = 0, int cols = 1, int colGap = 0);
+       Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap = 0, int iconSpace = 0, int cols = 1, int colGap = 0, int charsPerNumber = 0, char delimiter = ':');
 
 public:
        int Width() const;
        int Height() const;
-       int ColWidth() const { return iconSpace + font->CharWidth() * charsPerEntry; }
+       int ColWidth() const { return iconSpace + font->CharWidth() * (charsPerEntry + charsPerNumber) + (charsPerNumber ? font->CharWidth() : 0); }
        int RowHeight() const { return font->CharHeight() + rowGap; }
        int CharsPerEntry() const { return charsPerEntry; }
 
        T &Selected() { return entries[selected].value; }
        const T &Selected() const { return entries[selected].value; }
        const char *SelectedTitle() const { return entries[selected].title; }
+       int SelectedNumber() const { return entries[selected].number; }
        bool SelectedIsEnabled() const { return entries[selected].enabled; }
 
        void NextItem();
@@ -53,7 +54,8 @@ public:
        T &ValueAt(int index) { return entries[index].value; }
        const T &ValueAt(int index) const { return entries[index].value; }
 
-       void Add(const char *title, const T &value, bool enabled = true, const Sprite *icon = 0) { entries.push_back(Entry(title, value, enabled, icon)); }
+       void Add(const char *title, const T &value, bool enabled = true, const Sprite *icon = 0, int number = 0) { entries.push_back(Entry(title, value, enabled, icon, number)); }
+       void AddEmptyEntry() { entries.push_back(Entry(0, T(), false)); }
        void Disable(int index) { entries[index].enabled = false; }
        void Enable(int index) { entries[index].enabled = true; }
        void Reserve(int n) { entries.reserve(n); }
@@ -67,10 +69,11 @@ private:
 
 private:
        struct Entry {
-               Entry(const char *title, const T &value, bool enabled = true, const Sprite *icon = 0)
-               : title(title), icon(icon), value(value), enabled(enabled) { }
+               Entry(const char *title, const T &value, bool enabled = true, const Sprite *icon = 0, int number = 0)
+               : title(title), icon(icon), number(number), value(value), enabled(enabled) { }
                const char *title;
                const Sprite *icon;
+               int number;
                T value;
                bool enabled;
        };
@@ -86,6 +89,8 @@ private:
        int colGap;
        int selected;
        int topRow;
+       int charsPerNumber;
+       char delimiter;
 
 };
 
@@ -102,12 +107,14 @@ Menu<T>::Menu()
 , cols(0)
 , colGap(0)
 , selected(0)
-, topRow(0) {
+, topRow(0)
+, charsPerNumber(0)
+, delimiter(':') {
 
 }
 
 template<class T>
-Menu<T>::Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap, int iconSpace, int cols, int colGap)
+Menu<T>::Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap, int iconSpace, int cols, int colGap, int charsPerNumber, char delimiter)
 : font(font)
 , disabledFont(disabledFont ? disabledFont : font)
 , cursor(cursor)
@@ -118,7 +125,9 @@ Menu<T>::Menu(const Font *font, const Font *disabledFont, const Sprite *cursor,
 , cols(cols)
 , colGap(colGap)
 , selected(0)
-, topRow(0) {
+, topRow(0)
+, charsPerNumber(charsPerNumber)
+, delimiter(delimiter) {
 
 }
 
@@ -173,17 +182,22 @@ void Menu<T>::Draw(SDL_Surface *dest, geometry::Point<int> position) const {
        int items(entries.size() - start);
        int end(start + (items < slots ? items : slots));
        for (int i(0), count(end - start); i < count; ++i) {
+               if (!entries[start + i].title) continue;
                geometry::Vector<int> iconOffset(
                                (i % cols) * (ColWidth() + colGap),
                                (i / cols) * RowHeight());
                if (entries[start + i].icon) {
                        entries[start + i].icon->Draw(dest, position + iconOffset);
                }
-               geometry::Vector<int> labelOffset(iconOffset.X() +  + iconSpace, iconOffset.Y());
-               if (entries[start + i].enabled) {
-                       font->DrawString(entries[start + i].title, dest, position + labelOffset, charsPerEntry);
-               } else {
-                       disabledFont->DrawString(entries[start + i].title, dest, position + labelOffset, charsPerEntry);
+               geometry::Vector<int> labelOffset(iconOffset.X() + iconSpace, iconOffset.Y());
+               const Font *usedFont(entries[start + i].enabled ? font : disabledFont);
+               usedFont->DrawString(entries[start + i].title, dest, position + labelOffset, charsPerEntry);
+
+               if (charsPerNumber) {
+                       geometry::Vector<int> delimiterOffset(labelOffset.X() + charsPerEntry * usedFont->CharWidth(), labelOffset.Y());
+                       usedFont->DrawChar(delimiter, dest, position + delimiterOffset);
+                       geometry::Vector<int> numberOffset(delimiterOffset.X() + usedFont->CharWidth(), delimiterOffset.Y());
+                       usedFont->DrawNumber(entries[start + i].number, dest, position + numberOffset);
                }
        }
        geometry::Vector<int> cursorOffset(

diff --git a/src/main.cpp b/src/main.cpp
index cd76905d55b1371a02152d8248454c7996514cb0..dbe50d28f55d4b8be2d4ed531507c3ae14a45e4c 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -264,7 +264,7 @@ int main(int argc, char **argv) {
                battleRes.inventory = &inventory;
 
                battleRes.itemMenuHeadline = "Please choose an item.";
-               battleRes.itemMenuPrototype = Menu<const common::Item *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32);
+               battleRes.itemMenuPrototype = Menu<const common::Item *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':');
 
                battleRes.ikariMenuHeadline = "Please choose equipment.";
                battleRes.ikariMenuPrototype = Menu</* Item */ void *>(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32);