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

Xstairs_room followup

Browse Source 
Add a comment to explain why upstairs_room, dnstairs_room, and
sstiars_room aren't handled the same way has other level data.
This commit is contained in:
PatR
2019-07-06 16:18:23 -07:00
parent 7e72bc0944
commit bf672f7f47
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mklev.c
+12 -4
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 mklev.c $NHDT-Date: 1560304468 2019/06/12 01:54:28 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.61 $ */ /* NetHack 3.6 mklev.c $NHDT-Date: 1562455089 2019/07/06 23:18:09 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.63 $ */
/* 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. */
@@ -583,6 +583,10 @@ clear_level_structures()
register int x, y; register int x, y;
register struct rm *lev; register struct rm *lev;
/* note: normally we'd start at x=1 because map column #0 isn't used
(except for placing vault guard at <0,0> when removed from the map
but not from the level); explicitly reset column #0 along with the
rest so that we start the new level with a completely clean slate */
for (x = 0; x < COLNO; x++) { for (x = 0; x < COLNO; x++) {
lev = &levl[x][0]; lev = &levl[x][0];
for (y = 0; y < ROWNO; y++) { for (y = 0; y < ROWNO; y++) {
@@ -637,6 +641,7 @@ clear_level_structures()
xdnstair = ydnstair = xupstair = yupstair = 0; xdnstair = ydnstair = xupstair = yupstair = 0;
sstairs.sx = sstairs.sy = 0; sstairs.sx = sstairs.sy = 0;
xdnladder = ydnladder = xupladder = yupladder = 0; xdnladder = ydnladder = xupladder = yupladder = 0;
dnstairs_room = upstairs_room = sstairs_room = (struct mkroom *) 0;
made_branch = FALSE; made_branch = FALSE;
clear_regions(); clear_regions();
} }
@@ -1016,9 +1021,12 @@ mklev()
for (ridx = 0; ridx < SIZE(rooms); ridx++) for (ridx = 0; ridx < SIZE(rooms); ridx++)
rooms[ridx].orig_rtype = rooms[ridx].rtype; rooms[ridx].orig_rtype = rooms[ridx].rtype;
dnstairs_room = NULL; /* something like this usually belongs in clear_level_structures()
upstairs_room = NULL; but these aren't saved and restored so might not retain their
sstairs_room = NULL; values for the life of the current level; reset them to default
now so that they never do and no one will be tempted to introduce
a new use of them for anything on this level */
dnstairs_room = upstairs_room = sstairs_room = (struct mkroom *) 0;
reseed_random(rn2); reseed_random(rn2);
reseed_random(rn2_on_display_rng); reseed_random(rn2_on_display_rng);