From 1a89e44e19e755f2c499f62d0cd793f0fc52ea8f Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 17 Jan 2020 02:43:32 -0800 Subject: [PATCH] fix #K188 - trying to move past edge of level Trying to move into a wall or solid rock fails and doesn't do anything (unless the 'mention_walls' option is On) and doesn't use a turn, and trying to move off the edge of the map window also doesn't do anything (except for 'mention_walls') but that did use a turn. Don't. --- doc/fixes37.0 | 3 ++- src/hack.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/fixes37.0 b/doc/fixes37.0 index f027001a4..e19b8c84c 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.66 $ $NHDT-Date: 1578947634 2020/01/13 20:33:54 $ +$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.68 $ $NHDT-Date: 1579257808 2020/01/17 10:43:28 $ General Fixes and Modified Features ----------------------------------- @@ -45,6 +45,7 @@ walking out of tethered-to-buried-object trap condition was supposed to when poly'd into a giant and moving onto a boulder's spot, message given was confused about whether autopickup would occur so could be misleading random role selection wasn't honoring unwanted alignment(s) properly +if at the edge of the map window, trying to move farther fails but used a turn Fixes to 3.7.0-x Problems that Were Exposed Via git Repository diff --git a/src/hack.c b/src/hack.c index 06a99cf88..c1eb4f35c 100644 --- a/src/hack.c +++ b/src/hack.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 hack.c $NHDT-Date: 1578916008 2020/01/13 11:46:48 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.243 $ */ +/* NetHack 3.6 hack.c $NHDT-Date: 1579257808 2020/01/17 10:43:28 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.244 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Derek S. Ray, 2015. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1511,6 +1511,7 @@ domove_core() directionname(xytod(dx, dy))); } nomul(0); + g.context.move = 0; return; } if (((trap = t_at(x, y)) && trap->tseen)