X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FMenu.h;h=e288f2d6b946844dc1766652d67728ea6d9b0aea;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=b29e9687cc58bd7019bc9f879bea14c9e3b24340;hpb=ea2353f282a48a4474b32a1ab604eaf1aeff4e2b;p=l2e.git

diff --git a/src/graphics/Menu.h b/src/graphics/Menu.h
index b29e968..e288f2d 100644
--- a/src/graphics/Menu.h
+++ b/src/graphics/Menu.h
@@ -1,17 +1,9 @@
-/*
- * Menu.h
- *
- *  Created on: Aug 8, 2012
- *      Author: holy
- */
-
 #ifndef GRAPHICS_MENU_H_
 #define GRAPHICS_MENU_H_
 
 #include "Font.h"
-#include "fwd.h"
 #include "Sprite.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 
 #include <algorithm>
 #include <vector>
@@ -35,6 +27,7 @@ struct MenuProperties {
 	int charsPerNumber;
 	int charsPerAdditionalText;
 	int additionalTextGap;
+	int thirdColumnHack;
 	char delimiter;
 	bool wrapX;
 	bool wrapY;
@@ -44,7 +37,7 @@ struct MenuProperties {
 	, charsPerEntry(0), rows(1), rowGap(0)
 	, iconSpace(0), cols(1), colGap(0)
 	, charsPerNumber(0), charsPerAdditionalText(0)
-	, additionalTextGap(0), delimiter(':')
+	, additionalTextGap(0), thirdColumnHack(0), delimiter(':')
 	, wrapX(false), wrapY(false) { }
 
 	static void CreateTypeDescription();
@@ -109,8 +102,9 @@ public:
 	void Enable(int index) { entries[index].enabled = true; }
 	void Reserve(int n) { entries.reserve(n); }
 	void Clear() { entries.clear(); }
+	void ClearEntry(int at) { entries[at] = Entry(0, T(), false); }
 
-	void Draw(SDL_Surface *dest, const geometry::Vector<int> &position) const;
+	void Draw(SDL_Surface *dest, const math::Vector<int> &position) const;
 
 private:
 	int GetRow(int index) const { return index / cols; }
@@ -236,49 +230,52 @@ void Menu<T>::SelectIndex(int index) {
 
 
 template<class T>
-void Menu<T>::Draw(SDL_Surface *dest, const geometry::Vector<int> &position) const {
+void Menu<T>::Draw(SDL_Surface *dest, const math::Vector<int> &position) const {
 	int start(topRow * cols);
 	int slots(rows * cols);
 	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(
+		math::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);
+		// This fixes the position of the third column of the inventory and capsule menus.
+		if (thirdColumnHack && i % cols == 2) {
+			iconOffset += math::Vector<int>(font->CharWidth() * thirdColumnHack, 0);
 		}
 
 		if (entries[start + i].icon) {
 			entries[start + i].icon->Draw(dest, position + iconOffset);
 		}
-		geometry::Vector<int> textOffset(iconOffset.X() + iconSpace, iconOffset.Y());
+		math::Vector<int> textOffset(iconOffset.X() + iconSpace, iconOffset.Y());
 		const Font *usedFont(entries[start + i].enabled ? font : disabledFont);
 		usedFont->DrawString(entries[start + i].title, dest, position + textOffset, charsPerEntry);
 
-		textOffset += geometry::Vector<int>(charsPerEntry * usedFont->CharWidth(), 0);
+		textOffset += math::Vector<int>(charsPerEntry * usedFont->CharWidth(), 0);
 
 		if (charsPerAdditionalText) {
-			textOffset += geometry::Vector<int>(additionalTextGap, 0);
+			textOffset += math::Vector<int>(additionalTextGap, 0);
 			if (entries[start + i].additionalText) {
 				usedFont->DrawString(entries[start + i].additionalText, dest, position + textOffset, charsPerAdditionalText);
 			}
-			textOffset += geometry::Vector<int>(charsPerAdditionalText * usedFont->CharWidth(), 0);
+			textOffset += math::Vector<int>(charsPerAdditionalText * usedFont->CharWidth(), 0);
 		}
 
 		if (charsPerNumber) {
 			usedFont->DrawChar(delimiter, dest, position + textOffset);
-			textOffset += geometry::Vector<int>(usedFont->CharWidth(), 0);
+			textOffset += math::Vector<int>(usedFont->CharWidth(), 0);
 			usedFont->DrawNumber(entries[start + i].number, dest, position + textOffset, charsPerNumber);
 		}
 	}
-	geometry::Vector<int> cursorOffset(
+	math::Vector<int> cursorOffset(
 			(selected % cols) * (ColWidth() + colGap) - cursor->Width(),
 			((selected - start) / cols) * RowHeight());
+	// This fixes the position of the third column of the inventory and capsule menus.
+	if (thirdColumnHack && selected % cols == 2) {
+		cursorOffset += math::Vector<int>(font->CharWidth() * thirdColumnHack, 0);
+	}
 	switch (state) {
 		case STATE_INACTIVE:
 			break;
@@ -290,9 +287,9 @@ void Menu<T>::Draw(SDL_Surface *dest, const geometry::Vector<int> &position) con
 			break;
 		case STATE_DUAL:
 			cursor->Draw(dest, position + cursorOffset
-					- geometry::Vector<int>(selectedCursor->Width(), 0));
+					- math::Vector<int>(selectedCursor->Width(), 0));
 			if (secondarySelection >= start && secondarySelection <= end) {
-				geometry::Vector<int> secondaryOffset(
+				math::Vector<int> secondaryOffset(
 						(secondarySelection % cols) * (ColWidth() + colGap) - cursor->Width(),
 						((secondarySelection - start) / cols) * RowHeight());
 				selectedCursor->Draw(dest, position + secondaryOffset);
@@ -303,4 +300,4 @@ void Menu<T>::Draw(SDL_Surface *dest, const geometry::Vector<int> &position) con
 
 }
 
-#endif /* GRAPHICS_MENU_H_ */
+#endif