X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FMenu.h;h=179c457d6f9f4a2639f7f8ce416851fb1eeb3990;hb=350055a7ff27c74882aff8a4d6af2014782f830b;hp=68deef8da0814c98144fb656c02560f5813852c6;hpb=cc3905e6ddd9536139cb5d613c3e2d90c83b60fc;p=l2e.git

diff --git a/src/graphics/Menu.h b/src/graphics/Menu.h
index 68deef8..179c457 100644
--- a/src/graphics/Menu.h
+++ b/src/graphics/Menu.h
@@ -13,6 +13,7 @@
 #include "Sprite.h"
 #include "../geometry/Vector.h"
 
+#include <algorithm>
 #include <vector>
 #include <SDL.h>
 
@@ -63,8 +64,10 @@ 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;
@@ -78,12 +81,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(); }
@@ -96,6 +109,7 @@ 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;
 
@@ -116,11 +130,13 @@ private:
 	};
 	std::vector<Entry> entries;
 	int selected;
+	int secondarySelection;
 	int topRow;
 	enum State {
 		STATE_INACTIVE,
 		STATE_ACTIVE,
 		STATE_SELECTED,
+		STATE_DUAL,
 	};
 	State state;
 
@@ -131,6 +147,7 @@ template<class T>
 Menu<T>::Menu()
 : MenuProperties()
 , selected(0)
+, secondarySelection(0)
 , topRow(0)
 , state(STATE_ACTIVE) {
 
@@ -140,6 +157,7 @@ template<class T>
 Menu<T>::Menu(const MenuProperties &p)
 : MenuProperties(p)
 , selected(0)
+, secondarySelection(0)
 , topRow(0)
 , state(STATE_ACTIVE) {
 
@@ -262,6 +280,11 @@ void Menu<T>::Draw(SDL_Surface *dest, const geometry::Vector<int> &position) con
 	geometry::Vector<int> cursorOffset(
 			(selected % cols) * (ColWidth() + colGap) - cursor->Width(),
 			((selected - start) / cols) * RowHeight());
+	// Third column hack!
+	// This fixes the position of the "DROP" item in the inventory menu.
+	if (selected % cols == 2) {
+		cursorOffset += geometry::Vector<int>(font->CharWidth(), 0);
+	}
 	switch (state) {
 		case STATE_INACTIVE:
 			break;
@@ -271,6 +294,16 @@ void Menu<T>::Draw(SDL_Surface *dest, const geometry::Vector<int> &position) con
 		case STATE_SELECTED:
 			selectedCursor->Draw(dest, position + cursorOffset);
 			break;
+		case STATE_DUAL:
+			cursor->Draw(dest, position + cursorOffset
+					- geometry::Vector<int>(selectedCursor->Width(), 0));
+			if (secondarySelection >= start && secondarySelection <= end) {
+				geometry::Vector<int> secondaryOffset(
+						(secondarySelection % cols) * (ColWidth() + colGap) - cursor->Width(),
+						((secondarySelection - start) / cols) * RowHeight());
+				selectedCursor->Draw(dest, position + secondaryOffset);
+			}
+			break;
 	}
 }