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

makelevel() oddity

Browse Source 
There must have been a reason once to guard against calling makelevel()
when the dungeon hasn't been initialized yet, but that doesn't seem to
be necessary these days.  Calling Is_special() before init_dungeons()
is clearly a bug, so fix that.
This commit is contained in:
PatR
2024-10-05 15:48:44 -07:00
parent b61c3e5138
commit 5abee166f5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mklev.c
+6 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 mklev.c $NHDT-Date: 1704830831 2024/01/09 20:07:11 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.175 $ */ /* NetHack 3.7 mklev.c $NHDT-Date: 1728168518 2024/10/05 22:48:38 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.191 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Alex Smith, 2017. */ /*-Copyright (c) Alex Smith, 2017. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1105,14 +1105,17 @@ makelevel(void)
branch *branchp; branch *branchp;
stairway *prevstairs; stairway *prevstairs;
int room_threshold; int room_threshold;
s_level *slev = Is_special(&u.uz); s_level *slev;
int i; int i;
if (wiz1_level.dlevel == 0) if (wiz1_level.dlevel == 0) {
impossible("makelevel() called when dungeon not yet initialized.");
init_dungeons(); init_dungeons();
}
oinit(); /* assign level dependent obj probabilities */ oinit(); /* assign level dependent obj probabilities */
clear_level_structures(); clear_level_structures();
slev = Is_special(&u.uz);
/* check for special levels */ /* check for special levels */
if (slev && !Is_rogue_level(&u.uz)) { if (slev && !Is_rogue_level(&u.uz)) {
makemaz(slev->proto); makemaz(slev->proto);