finish moving a couple of short patches to 3.6.4

And make the revised teleport portion match.
This commit is contained in:
PatR
2019-12-13 17:54:00 -08:00
parent 057fff6b7c
commit 80f52d5d53
2 changed files with 3 additions and 8 deletions

View File

@@ -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;