Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
/* NetHack 3.6 dungeon.c $NHDT-Date: 1550103076 2019/02/14 00:11:16 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.91 $ */
|
/* NetHack 3.6 dungeon.c $NHDT-Date: 1554341477 2019/04/04 01:31:17 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.92 $ */
|
||||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||||
/*-Copyright (c) Robert Patrick Rankin, 2012. */
|
/*-Copyright (c) Robert Patrick Rankin, 2012. */
|
||||||
/* NetHack may be freely redistributed. See license for details. */
|
/* NetHack may be freely redistributed. See license for details. */
|
||||||
@@ -967,7 +967,7 @@ init_dungeons()
|
|||||||
if (dunlevs_in_dungeon(&x->dlevel) > 1 - dungeons[i].depth_start)
|
if (dunlevs_in_dungeon(&x->dlevel) > 1 - dungeons[i].depth_start)
|
||||||
dungeons[i].depth_start -= 1;
|
dungeons[i].depth_start -= 1;
|
||||||
/* TODO: strip "dummy" out all the way here,
|
/* TODO: strip "dummy" out all the way here,
|
||||||
so that it's hidden from <ctrl/O> feedback. */
|
so that it's hidden from '#wizwhere' feedback. */
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
@@ -1663,7 +1663,7 @@ const char *nam;
|
|||||||
*(eos(buf) - 6) = '\0';
|
*(eos(buf) - 6) = '\0';
|
||||||
}
|
}
|
||||||
/* hell is the old name, and wouldn't match; gehennom would match its
|
/* hell is the old name, and wouldn't match; gehennom would match its
|
||||||
branch, yielding the castle level instead of the valley of the dead */
|
branch, yielding the castle level instead of valley of the dead */
|
||||||
if (!strcmpi(nam, "gehennom") || !strcmpi(nam, "hell")) {
|
if (!strcmpi(nam, "gehennom") || !strcmpi(nam, "hell")) {
|
||||||
if (In_V_tower(&u.uz))
|
if (In_V_tower(&u.uz))
|
||||||
nam = " to Vlad's tower"; /* branch to... */
|
nam = " to Vlad's tower"; /* branch to... */
|
||||||
|
|||||||
Reference in New Issue
Block a user