X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FInventoryMenu.cpp;h=437cd9cb03d096c72d722ded4c13f2d910d5afb4;hb=1852ed1ca9ccfb63183fec12efeeaccc211a9f72;hp=429fefe59da30888f73b0037c6ae493ec8495daf;hpb=24a1c72ef826bac796575dd259d43db55054482e;p=l2e.git

diff --git a/src/menu/InventoryMenu.cpp b/src/menu/InventoryMenu.cpp
index 429fefe..437cd9c 100644
--- a/src/menu/InventoryMenu.cpp
+++ b/src/menu/InventoryMenu.cpp
@@ -23,6 +23,7 @@ using common::Item;
 using geometry::Vector;
 using graphics::Font;
 using graphics::Frame;
+using std::swap;
 
 namespace menu {
 
@@ -99,14 +100,45 @@ void InventoryMenu::HandleEvents(const Input &input) {
 				menu.SetSelected();
 				itemMenu.SetActive();
 			}
+		} else if (itemMenu.IsActive()) {
+			itemMenu.SetDualSelection();
+		} else if (itemMenu.SelectedIndex() == itemMenu.SecondaryIndex()) {
+			switch (menu.Selected()) {
+				case CHOICE_USE:
+					if (itemMenu.Selected()->CanUseOnStatusScreen()) {
+						// TODO: implement item use
+					}
+					itemMenu.SetActive();
+					break;
+				case CHOICE_SORT:
+					// invalid state, recover
+					menu.SetActive();
+					itemMenu.SetInactive();
+					break;
+				case CHOICE_DROP:
+					if (itemMenu.Selected()->CanDrop()) {
+						parent->Game().state->inventory.RemoveAll(itemMenu.Selected());
+						itemMenu.ClearEntry(itemMenu.SelectedIndex());
+					}
+					itemMenu.SetActive();
+					break;
+			}
+		} else {
+			parent->Game().state->inventory.SwapEntriesAt(
+					itemMenu.SelectedIndex(),
+					itemMenu.SecondaryIndex());
+			itemMenu.SwapSelected();
+			itemMenu.SetActive();
 		}
 	}
 	if (input.JustPressed(Input::ACTION_B)) {
 		if (menu.IsActive()) {
 			Ctrl().PopState();
-		} else {
+		} else if (itemMenu.IsActive()) {
 			menu.SetActive();
 			itemMenu.SetInactive();
+		} else {
+			itemMenu.SetActive();
 		}
 	}
 }