X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FMenu.h;h=26b9d0527033484ee594f72d7342b816b2d46898;hb=fb10fbd4a72793048916557308772fdaa2afebc2;hp=172c3184d4e57d7912083a4f3b4f78eb3a9caacc;hpb=859750479ac0c8febfaf4eb603fc599aef4571ca;p=l2e.git

diff --git a/src/graphics/Menu.h b/src/graphics/Menu.h
index 172c318..26b9d05 100644
--- a/src/graphics/Menu.h
+++ b/src/graphics/Menu.h
@@ -27,17 +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();
@@ -52,10 +54,12 @@ 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); }
+	void Clear() { entries.clear(); }
 
 	void Draw(SDL_Surface *dest, geometry::Point<int> position) const;
 
@@ -65,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;
 	};
@@ -84,6 +89,8 @@ private:
 	int colGap;
 	int selected;
 	int topRow;
+	int charsPerNumber;
+	char delimiter;
 
 };
 
@@ -100,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)
@@ -116,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) {
 
 }
 
@@ -171,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(