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

Remove unused "mazeflag" parameter from mkfount()

Browse Source 
This parameter appears to have been in the code for a very long time,
but never used, since no version of NetHack I can find had mazes with
randomly placed fountains in them. Certainly isn't used now, so this can
be reduced to the same call to find_okay_roompos used by similar
functions such as mksink.
This commit is contained in:
copperwater
2022-05-28 10:42:14 -04:00
parent 84f4e53fde
commit a1258f898b
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mklev.c
+5 -12
View File
@@ -12,7 +12,7 @@
static boolean generate_stairs_room_good(struct mkroom *, int); static boolean generate_stairs_room_good(struct mkroom *, int);
static struct mkroom *generate_stairs_find_room(void); static struct mkroom *generate_stairs_find_room(void);
static void generate_stairs(void); static void generate_stairs(void);
static void mkfount(int, struct mkroom *); static void mkfount(struct mkroom *);
static boolean find_okay_roompos(struct mkroom *, coord *); static boolean find_okay_roompos(struct mkroom *, coord *);
static void mksink(struct mkroom *); static void mksink(struct mkroom *);
static void mkaltar(struct mkroom *); static void mkaltar(struct mkroom *);
@@ -789,7 +789,7 @@ fill_ordinary_room(struct mkroom *croom)
if (Is_rogue_level(&u.uz)) if (Is_rogue_level(&u.uz))
goto skip_nonrogue; goto skip_nonrogue;
if (!rn2(10)) if (!rn2(10))
mkfount(0, croom); mkfount(croom);
if (!rn2(60)) if (!rn2(60))
mksink(croom); mksink(croom);
if (!rn2(60)) if (!rn2(60))
@@ -1752,19 +1752,12 @@ generate_stairs(void)
} }
static void static void
mkfount(int mazeflag, struct mkroom *croom) mkfount(struct mkroom *croom)
{ {
coord m; coord m;
register int tryct = 0;
do { if (!find_okay_roompos(croom, &m))
if (++tryct > 200) return;
return;
if (mazeflag)
mazexy(&m);
else if (!somexy(croom, &m))
return;
} while (occupied(m.x, m.y) || bydoor(m.x, m.y));
/* Put a fountain at m.x, m.y */ /* Put a fountain at m.x, m.y */
if (!set_levltyp(m.x, m.y, FOUNTAIN)) if (!set_levltyp(m.x, m.y, FOUNTAIN))