Merge branch 'pr669' into NetHack-3.7

This commit is contained in:
nhmall
2022-02-08 08:21:34 -05:00

View File

@@ -2588,6 +2588,9 @@ fill_special_room(struct mkroom* croom)
{
int i;
if (!croom)
return;
/* First recurse into subrooms. We don't want to block an ordinary room with
* a special subroom from having the subroom filled, or an unfilled outer
* room preventing a special subroom from being filled. */
@@ -2595,7 +2598,7 @@ fill_special_room(struct mkroom* croom)
fill_special_room(croom->sbrooms[i]);
}
if (!croom || croom->rtype == OROOM || croom->rtype == THEMEROOM
if (croom->rtype == OROOM || croom->rtype == THEMEROOM
|| croom->needfill == FILL_NONE)
return;