]> granicus.if.org Git - nethack/commitdiff
Add moving on the trap to the mouse menu
authorPasi Kallinen <paxed@alt.org>
Mon, 11 Apr 2022 12:08:50 +0000 (15:08 +0300)
committerPasi Kallinen <paxed@alt.org>
Mon, 11 Apr 2022 12:08:50 +0000 (15:08 +0300)
src/cmd.c

index 75593ef7103235e04f10ca85d3df560584e5ada2..e5edf78953e533298d3a52e98f31df07e542a166 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -4492,6 +4492,7 @@ enum menucmd {
     MCMD_SEARCH,
     MCMD_LOOK_TRAP,
     MCMD_UNTRAP_TRAP,
+    MCMD_MOVE_DIR,
     MCMD_RIDE,
     MCMD_REMOVE_SADDLE,
     MCMD_APPLY_SADDLE,
@@ -4665,7 +4666,7 @@ there_cmd_menu_next2u(winid win, int x, int y, int mod, int *act)
         if (ttmp->ttyp != VIBRATING_SQUARE)
             mcmd_addmenu(win, MCMD_UNTRAP_TRAP,
                                  "Attempt to disarm trap"), ++K;
-        /* TODO: "Step on the <trap>" */
+        mcmd_addmenu(win, MCMD_MOVE_DIR, "Move on the trap"), ++K;
     }
 
     mtmp = m_at(x, y);
@@ -4843,6 +4844,9 @@ there_cmd_menu(int x, int y, int mod)
             cmdq_add_ec(dountrap);
             cmdq_add_dir(dx, dy, 0);
             break;
+        case MCMD_MOVE_DIR:
+            cmdq_add_ec(move_funcs[xytod(dx, dy)][MV_WALK]);
+            break;
         case MCMD_RIDE:
             cmdq_add_ec(doride);
             cmdq_add_dir(dx, dy, 0);