nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Restore old behavior for running onto trap

Browse Source 
The refactor of domove made it impossible to run onto a trap (or water,
if blind), even in the shift-dir mode where the hero is meant to stop
only upon "hitting a wall or running into something".  I use this
runmode to sprint large distances across the map, and the change to this
behavior meant that it was no longer possible to press shift-dir again
to continue past the trap.  This restores the old behavior of allowing
shift-dir running to carry you onto a trap (though the hero will still
stop before hitting a trap in less breakneck runmodes).
This commit is contained in:
Michael Meyer
2022-08-10 20:01:22 +03:00
committed by Pasi Kallinen
parent 9d28a8dc76
commit ce0107aff9
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hack.c
+6 -8
View File
@@ -2149,18 +2149,16 @@ avoid_moving_on_liquid(
static boolean static boolean
avoid_running_into_trap_or_liquid(coordxy x, coordxy y) avoid_running_into_trap_or_liquid(coordxy x, coordxy y)
{ {
boolean would_stop = (g.context.run >= 2);
if (!g.context.run) if (!g.context.run)
return FALSE; return FALSE;
if (avoid_moving_on_trap(x,y, TRUE)) { if (avoid_moving_on_trap(x,y, would_stop)
|| (Blind && avoid_moving_on_liquid(x,y, would_stop))) {
nomul(0); nomul(0);
g.context.move = 0; if (would_stop)
return TRUE; g.context.move = 0;
} return would_stop;
if (Blind && avoid_moving_on_liquid(x,y, TRUE)) {
nomul(0);
g.context.move = 0;
return TRUE;
} }
return FALSE; return FALSE;
} }