X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FMenu.h;h=4dc60323571cbeb37134fe51d2bf6f911a231a70;hb=1907ca03c5e865c4d398170042aa384c67ffff29;hp=4d448b62df6de2b824f85eac8f2dacf587857ec4;hpb=4170813213bafe6f4a01a79bf42308ddb7f3c545;p=l2e.git

diff --git a/src/graphics/Menu.h b/src/graphics/Menu.h
index 4d448b6..4dc6032 100644
--- a/src/graphics/Menu.h
+++ b/src/graphics/Menu.h
@@ -9,9 +9,8 @@
 #define GRAPHICS_MENU_H_
 
 #include "Font.h"
+#include "fwd.h"
 #include "Sprite.h"
-#include "../geometry/operators.h"
-#include "../geometry/Point.h"
 #include "../geometry/Vector.h"
 
 #include <vector>
@@ -19,14 +18,45 @@
 
 namespace graphics {
 
-class Sprite;
+struct MenuProperties {
+	static const int TYPE_ID = 407;
+
+	const Font *font;
+	const Font *disabledFont;
+	const Sprite *cursor;
+	int charsPerEntry;
+	int rows;
+	int rowGap;
+	int iconSpace;
+	int cols;
+	int colGap;
+	int charsPerNumber;
+	int charsPerAdditionalText;
+	int additionalTextGap;
+	char delimiter;
+
+	MenuProperties()
+	: font(0), disabledFont(0), cursor(0)
+	, charsPerEntry(0), rows(0), rowGap(0)
+	, iconSpace(0), cols(0), 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) { }
+
+	static void CreateTypeDescription();
+	static void Construct(void *);
+
+};
 
-// TODO: animation when top row changes
 template<class T>
-class Menu {
+class Menu
+: private MenuProperties {
 
 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:
@@ -61,7 +91,7 @@ public:
 	void Reserve(int n) { entries.reserve(n); }
 	void Clear() { entries.clear(); }
 
-	void Draw(SDL_Surface *dest, geometry::Point<int> position) const;
+	void Draw(SDL_Surface *dest, const geometry::Vector<int> &position) const;
 
 private:
 	int GetRow(int index) const { return index / cols; }
@@ -78,63 +108,41 @@ private:
 		T value;
 		bool enabled;
 	};
-	const Font *font;
-	const Font *disabledFont;
-	const Sprite *cursor;
 	std::vector<Entry> entries;
-	int charsPerEntry;
-	int rows;
-	int rowGap;
-	int iconSpace;
-	int cols;
-	int colGap;
 	int selected;
 	int topRow;
-	int charsPerNumber;
-	int charsPerAdditionalText;
-	int additionalTextGap;
-	char delimiter;
 
 };
 
 
 template<class T>
 Menu<T>::Menu()
-: font(0)
-, disabledFont(0)
-, cursor(0)
-, charsPerEntry(0)
-, rows(0)
-, rowGap(0)
-, iconSpace(0)
-, cols(0)
-, colGap(0)
+: MenuProperties()
+, selected(0)
+, topRow(0) {
+
+}
+
+template<class T>
+Menu<T>::Menu(const MenuProperties &p)
+: MenuProperties(p)
 , selected(0)
-, topRow(0)
-, charsPerNumber(0)
-, charsPerAdditionalText(0)
-, additionalTextGap(0)
-, delimiter(':') {
+, topRow(0) {
 
 }
 
 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)
-: font(font)
-, disabledFont(disabledFont ? disabledFont : font)
-, cursor(cursor)
-, charsPerEntry(charsPerEntry)
-, rows(rows)
-, rowGap(rowGap)
-, iconSpace(iconSpace)
-, cols(cols)
-, colGap(colGap)
+: MenuProperties(
+		font, disabledFont ? disabledFont : font,
+		cursor, charsPerEntry,
+		rows, rowGap, iconSpace,
+		cols, colGap, charsPerNumber,
+		delimiter,
+		charsPerAdditionalText,
+		additionalTextGap)
 , selected(0)
-, topRow(0)
-, charsPerNumber(charsPerNumber)
-, charsPerAdditionalText(charsPerAdditionalText)
-, additionalTextGap(additionalTextGap)
-, delimiter(delimiter) {
+, topRow(0) {
 
 }
 
@@ -196,7 +204,7 @@ void Menu<T>::SelectIndex(int index) {
 
 
 template<class T>
-void Menu<T>::Draw(SDL_Surface *dest, geometry::Point<int> position) const {
+void Menu<T>::Draw(SDL_Surface *dest, const geometry::Vector<int> &position) const {
 	int start(topRow * cols);
 	int slots(rows * cols);
 	int items(entries.size() - start);