lower priority of hardcoded key in inventory

#395
Try · Jan 29, 2023 · b9f20ee · b9f20ee
1 parent ff635df
commit b9f20ee
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/game/ui/inventorymenu.cpp b/game/ui/inventorymenu.cpp
@@ -302,26 +302,11 @@ void InventoryMenu::keyDownEvent(KeyEvent &e) {
 
   processMove(e);
 
-  if(e.key==KeyEvent::K_Z) {
-    lootMode = LootMode::Ten;
-    takeTimer.start(200);
-    onTakeStuff();
-    }
-  else if(e.key==KeyEvent::K_X) {
-    lootMode = LootMode::Hundred;
-    takeTimer.start(200);
-    onTakeStuff();
-    }
-  else if(e.key==KeyEvent::K_Space) {
+  if(keycodec.tr(e)==KeyCodec::Jump) {
     lootMode = LootMode::Stack;
     takeTimer.start(200);
     onTakeStuff();
     }
-  else if(keycodec.tr(e)==KeyCodec::Jump) {
-    lootMode = LootMode::Normal;
-    takeTimer.start(200);
-    onTakeStuff();
-    }
   else if (keycodec.tr(e)==KeyCodec::ActionGeneric || e.key==KeyEvent::K_Return) {
     onItemAction(Item::NSLOT);
     }
@@ -334,6 +319,21 @@ void InventoryMenu::keyDownEvent(KeyEvent &e) {
   else if(e.key==KeyEvent::K_ESCAPE || keycodec.tr(e)==KeyCodec::Inventory){
     close();
     }
+  else if(e.key==KeyEvent::K_Space) {
+    lootMode = LootMode::Normal;
+    takeTimer.start(200);
+    onTakeStuff();
+    }
+  else if(e.key==KeyEvent::K_Z) {
+    lootMode = LootMode::Ten;
+    takeTimer.start(200);
+    onTakeStuff();
+    }
+  else if(e.key==KeyEvent::K_X) {
+    lootMode = LootMode::Hundred;
+    takeTimer.start(200);
+    onTakeStuff();
+    }
 
   adjustScroll();
   update();