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

diff --git a/src/graphics/Menu.h b/src/graphics/Menu.h
index e962738..91cc3a7 100644
--- a/src/graphics/Menu.h
+++ b/src/graphics/Menu.h
@@ -1,28 +1,24 @@
-/*
- * 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>
 #include <SDL.h>
 
 namespace graphics {
 
-class Sprite;
-
 struct MenuProperties {
+	static const int TYPE_ID = 407;
+
 	const Font *font;
 	const Font *disabledFont;
 	const Sprite *cursor;
+	const Sprite *selectedCursor;
 	int charsPerEntry;
 	int rows;
 	int rowGap;
@@ -32,17 +28,18 @@ struct MenuProperties {
 	int charsPerNumber;
 	int charsPerAdditionalText;
 	int additionalTextGap;
+	int thirdColumnHack;
 	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)
+	: font(0), disabledFont(0), cursor(0), selectedCursor(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), thirdColumnHack(0), delimiter(':')
+	, wrapX(false), wrapY(false) { }
 
 	static void CreateTypeDescription();
 	static void Construct(void *);
@@ -56,9 +53,16 @@ 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:
+	void SetInactive() { state = STATE_INACTIVE; }
+	void SetActive() { state = STATE_ACTIVE; }
+	void SetSelected() { state = STATE_SELECTED; }
+	void SetDualSelection() { state = STATE_DUAL; secondarySelection = selected; }
+	bool IsActive() const { return state == STATE_ACTIVE; }
+	bool HasSelected() const { return state == STATE_SELECTED; }
+	bool InDualMode() const { return state == STATE_DUAL; }
+
 	int Width() const;
 	int Height() const;
 	int ColWidth() const;
@@ -71,12 +75,22 @@ public:
 	int SelectedNumber() const { return entries[selected].number; }
 	bool SelectedIsEnabled() const { return entries[selected].enabled; }
 
+	T &SecondarySelection() { return entries[secondarySelection].value; }
+	const T &SecondarySelection() const { return entries[secondarySelection].value; }
+	const char *SecondaryTitle() const { return entries[secondarySelection].title; }
+	int SecondaryNumber() const { return entries[secondarySelection].number; }
+	bool SecondaryIsEnabled() const { return entries[secondarySelection].enabled; }
+
+	void SwapSelected() { SwapEntriesAt(selected, secondarySelection); }
+	void SwapEntriesAt(int lhs, int rhs) { std::swap(entries[lhs], entries[rhs]); }
+
 	void NextItem();
 	void PreviousItem();
 	void NextRow();
 	void PreviousRow();
 	void SelectIndex(int index);
 	int SelectedIndex() const { return selected; }
+	int SecondaryIndex() const { return secondarySelection; }
 	bool IsSelected(int index) const { return index == selected; }
 
 	int EntryCount() const { return entries.size(); }
@@ -89,8 +103,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; }
@@ -109,7 +124,15 @@ private:
 	};
 	std::vector<Entry> entries;
 	int selected;
+	int secondarySelection;
 	int topRow;
+	enum State {
+		STATE_INACTIVE,
+		STATE_ACTIVE,
+		STATE_SELECTED,
+		STATE_DUAL,
+	};
+	State state;
 
 };
 
@@ -118,7 +141,9 @@ template<class T>
 Menu<T>::Menu()
 : MenuProperties()
 , selected(0)
-, topRow(0) {
+, secondarySelection(0)
+, topRow(0)
+, state(STATE_ACTIVE) {
 
 }
 
@@ -126,22 +151,9 @@ template<class T>
 Menu<T>::Menu(const MenuProperties &p)
 : MenuProperties(p)
 , selected(0)
-, 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)
-: MenuProperties(
-		font, disabledFont ? disabledFont : font,
-		cursor, charsPerEntry,
-		rows, rowGap, iconSpace,
-		cols, colGap, charsPerNumber,
-		delimiter,
-		charsPerAdditionalText,
-		additionalTextGap)
-, selected(0)
-, topRow(0) {
+, secondarySelection(0)
+, topRow(0)
+, state(STATE_ACTIVE) {
 
 }
 
@@ -172,22 +184,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>
@@ -203,43 +231,72 @@ 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());
+
+		// 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);
-			usedFont->DrawNumber(entries[start + i].number, dest, position + textOffset);
+			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());
-	cursor->Draw(dest, position + cursorOffset);
+	// 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;
+		case STATE_ACTIVE:
+			cursor->Draw(dest, position + cursorOffset);
+			break;
+		case STATE_SELECTED:
+			selectedCursor->Draw(dest, position + cursorOffset);
+			break;
+		case STATE_DUAL:
+			cursor->Draw(dest, position + cursorOffset
+					- math::Vector<int>(selectedCursor->Width(), 0));
+			if (secondarySelection >= start && secondarySelection <= end) {
+				math::Vector<int> secondaryOffset(
+						(secondarySelection % cols) * (ColWidth() + colGap) - cursor->Width(),
+						((secondarySelection - start) / cols) * RowHeight());
+				selectedCursor->Draw(dest, position + secondaryOffset);
+			}
+			break;
+	}
 }
 
 }