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

Fix boulder-on-lava sanity error

Browse Source 
Special level creation could make levels with boulders on top
of lava or water; this was caused by mazewalk populating the maze
before the rest of the level was created.

Add a post-level-creation map cleanup routine, where boulders
and traps on liquid terrain are removed.
This commit is contained in:
Pasi Kallinen
2023-03-17 13:13:19 +02:00
parent 0178ed81e1
commit a5934470dd
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/sp_lev.c
View File

@@ -20,6 +20,7 @@ extern void mkmap(lev_init *);
static boolean match_maptyps(xint16, xint16);
static void solidify_map(void);
static void map_cleanup(void);
static void lvlfill_maze_grid(int, int, int, int, schar);
static void lvlfill_solid(schar, schar);
static void lvlfill_swamp(schar, schar, schar);
@@ -322,6 +323,34 @@ solidify_map(void)
levl[x][y].wall_info |= (W_NONDIGGABLE | W_NONPASSWALL);
}
/* do a post-level-creation cleanup of map, such as
removing boulders and traps from lava */
static void
map_cleanup(void)
{
struct obj *otmp;
struct trap *ttmp;
coordxy x, y;
for (x = 0; x < COLNO; x++)
for (y = 0; y < ROWNO; y++) {
schar typ = levl[x][y].typ;
if (typ == LAVAPOOL || typ == LAVAWALL || IS_POOL(typ)) {
/* in case any boulders are on liquid, delete them */
while ((otmp = sobj_at(BOULDER, x, y)) != 0) {
obj_extract_self(otmp);
obfree(otmp, (struct obj *)0);
}
/* traps on liquid? */
if (((ttmp = t_at(x, y)) != 0)
&& !undestroyable_trap(ttmp->ttyp))
deltrap(ttmp);
}
}
}
static void
lvlfill_maze_grid(int x1, int y1, int x2, int y2, schar filling)
{
@@ -6473,6 +6502,8 @@ lspo_finalize_level(lua_State *L UNUSED)
if (L && gc.coder->check_inaccessibles)
ensure_way_out();
map_cleanup();
/* FIXME: Ideally, we want this call to only cover areas of the map
* which were not inserted directly by the special level file (see
* the insect legs on Baalzebub's level, for instance). Since that
@@ -6947,6 +6978,8 @@ load_special(const char *name)
if (gc.coder->check_inaccessibles)
ensure_way_out();
map_cleanup();
/* FIXME: Ideally, we want this call to only cover areas of the map
* which were not inserted directly by the special level file (see
* the insect legs on Baalzebub's level, for instance). Since that