X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FMenu.h;h=e42f24e0cfcf7334777f99616aaa6fa34c44b990;hb=c1de2db3755c2cffd790c58bbd92e7fc993afcb5;hp=e9627389e958323b7012f83e5e639df67640c23a;hpb=b02da898c7c8a08141df4e797774a61cf5e0163f;p=l2e.git

diff --git a/src/graphics/Menu.h b/src/graphics/Menu.h
index e962738..e42f24e 100644
--- a/src/graphics/Menu.h
+++ b/src/graphics/Menu.h
@@ -9,6 +9,7 @@
 #define GRAPHICS_MENU_H_
 
 #include "Font.h"
+#include "fwd.h"
 #include "Sprite.h"
 #include "../geometry/Vector.h"
 
@@ -17,9 +18,9 @@
 
 namespace graphics {
 
-class Sprite;
-
 struct MenuProperties {
+	static const int TYPE_ID = 407;
+
 	const Font *font;
 	const Font *disabledFont;
 	const Sprite *cursor;
@@ -33,16 +34,16 @@ struct MenuProperties {
 	int charsPerAdditionalText;
 	int additionalTextGap;
 	char delimiter;
+	bool wrapX;
+	bool wrapY;
 
 	MenuProperties()
 	: font(0), disabledFont(0), cursor(0)
-	, charsPerEntry(0), rows(0), rowGap(0)
-	, iconSpace(0), cols(0), colGap(0)
+	, charsPerEntry(0), rows(1), rowGap(0)
+	, iconSpace(0), cols(1), colGap(0)
 	, charsPerNumber(0), charsPerAdditionalText(0)
-	, additionalTextGap(0), delimiter(':') { }
-
-	MenuProperties(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, int charsPerAdditionalText, int additionalTextGap)
-	: font(font), disabledFont(disabledFont), cursor(cursor), charsPerEntry(charsPerEntry), rows(rows), rowGap(rowGap), iconSpace(iconSpace), cols(cols), colGap(colGap), charsPerNumber(charsPerNumber), charsPerAdditionalText(charsPerAdditionalText), additionalTextGap(additionalTextGap), delimiter(delimiter) { }
+	, additionalTextGap(0), delimiter(':')
+	, wrapX(false), wrapY(false) { }
 
 	static void CreateTypeDescription();
 	static void Construct(void *);
@@ -56,7 +57,6 @@ class Menu
 public:
 	Menu();
 	Menu(const MenuProperties &);
-	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 = ':', int charsPerAdditionalText = 0, int additionalTextGap = 0);
 
 public:
 	int Width() const;
@@ -130,21 +130,6 @@ Menu<T>::Menu(const MenuProperties &p)
 
 }
 
-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, int charsPerNumber, char delimiter, int charsPerAdditionalText, int additionalTextGap)
-: MenuProperties(
-		font, disabledFont ? disabledFont : font,
-		cursor, charsPerEntry,
-		rows, rowGap, iconSpace,
-		cols, colGap, charsPerNumber,
-		delimiter,
-		charsPerAdditionalText,
-		additionalTextGap)
-, selected(0)
-, topRow(0) {
-
-}
-
 
 template<class T>
 int Menu<T>::ColWidth() const {
@@ -172,22 +157,38 @@ int Menu<T>::Height() const {
 
 template<class T>
 void Menu<T>::NextItem() {
-	SelectIndex(selected + 1);
+	int index(selected + 1);
+	if (wrapX && index % cols == 0) {
+		index -= cols;
+	}
+	SelectIndex(index);
 }
 
 template<class T>
 void Menu<T>::PreviousItem() {
-	SelectIndex(selected - 1);
+	int index(selected - 1);
+	if (wrapX && selected % cols == 0) {
+		index += cols;
+	}
+	SelectIndex(index);
 }
 
 template<class T>
 void Menu<T>::NextRow() {
-	SelectIndex(selected + cols);
+	int index(selected + cols);
+	if (wrapY && index >= int(entries.size())) {
+		index -= entries.size();
+	}
+	SelectIndex(index);
 }
 
 template<class T>
 void Menu<T>::PreviousRow() {
-	SelectIndex(selected - cols);
+	int index(selected - cols);
+	if (wrapY && index < 0) {
+		index += entries.size();
+	}
+	SelectIndex(index);
 }
 
 template<class T>
@@ -213,6 +214,13 @@ void Menu<T>::Draw(SDL_Surface *dest, const geometry::Vector<int> &position) con
 		geometry::Vector<int> iconOffset(
 				(i % cols) * (ColWidth() + colGap),
 				(i / cols) * RowHeight());
+
+		// Third column hack!
+		// This fixes the position of the "DROP" item in the inventory menu.
+		if (i % cols == 2) {
+			iconOffset += geometry::Vector<int>(font->CharWidth(), 0);
+		}
+
 		if (entries[start + i].icon) {
 			entries[start + i].icon->Draw(dest, position + iconOffset);
 		}
@@ -233,7 +241,7 @@ void Menu<T>::Draw(SDL_Surface *dest, const geometry::Vector<int> &position) con
 		if (charsPerNumber) {
 			usedFont->DrawChar(delimiter, dest, position + textOffset);
 			textOffset += geometry::Vector<int>(usedFont->CharWidth(), 0);
-			usedFont->DrawNumber(entries[start + i].number, dest, position + textOffset);
+			usedFont->DrawNumber(entries[start + i].number, dest, position + textOffset, charsPerNumber);
 		}
 	}
 	geometry::Vector<int> cursorOffset(