From 80f52d5d53852a2775e34c8d6f6cd5d4a39e923f Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 13 Dec 2019 17:54:00 -0800 Subject: [PATCH] finish moving a couple of short patches to 3.6.4 And make the revised teleport portion match. --- doc/fixes37.0 | 6 +----- src/teleport.c | 5 ++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/doc/fixes37.0 b/doc/fixes37.0 index ca87a330a..37627fafa 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.19 $ $NHDT-Date: 1575755075 2019/12/07 21:44:35 $ +$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.22 $ $NHDT-Date: 1576288434 2019/12/14 01:53:54 $ General Fixes and Modified Features ----------------------------------- @@ -10,12 +10,8 @@ hero polymorphed into a vampire can use #monster to shape-shift rather than adjust bones filename buffer sizes to accommodate suffix fix internal self-recover to work with recent fields added to checkpoint file improvements to pronoun usage when hallucinating -message "your knapsack can't accomodate any more items" when picking stuff up - or removing such from container was inaccurate if there was some gold - pending; vary the message rather than add more convoluted pickup code function calls made from mapglyph based on dungeon level are now called once per level -allow teleporting onto the vibrating square Fixes to Pre-3.7.0 Problems that Were Exposed Via git Repository diff --git a/src/teleport.c b/src/teleport.c index c6093038e..8c6af94b6 100644 --- a/src/teleport.c +++ b/src/teleport.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 teleport.c $NHDT-Date: 1576281515 2019/12/13 23:58:35 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.95 $ */ +/* NetHack 3.6 teleport.c $NHDT-Date: 1576288434 2019/12/14 01:53:54 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.106 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */ /* NetHack may be freely redistributed. See license for details. */ @@ -264,9 +264,8 @@ boolean trapok; /* allow teleportation onto vibrating square, it's not a real trap */ struct trap *trap = t_at(x, y); - if (trap && trap->ttyp != VIBRATING_SQUARE) { + if (trap && trap->ttyp != VIBRATING_SQUARE) return FALSE; - } } if (!goodpos(x, y, &g.youmonst, 0)) return FALSE;