From a7daa522a4e33a1a29cf082ed60c74742e2b4d8e Mon Sep 17 00:00:00 2001 From: PatR Date: Tue, 3 Jul 2018 15:49:44 -0700 Subject: [PATCH] fix github pull request #114 - ant holes in *.des Fixes #114 Report and contributed fix described lack of support for room type "ant hole" in the code that loads special levels (and mentioned that none of our des files attempted to use that room type so it isn't noticeable in unmodified version of the game). The fix overlooked a couple of other missing room types (leprechaun hall and cockatrice nest) so I didn't use the pull-request's commit (so not sure what github's automated updating will make of 'Fixes #114'). --- doc/fixes36.2 | 2 ++ src/sp_lev.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/fixes36.2 b/doc/fixes36.2 index d2cfcdd62..a4c3a8f09 100644 --- a/doc/fixes36.2 +++ b/doc/fixes36.2 @@ -58,6 +58,8 @@ when using 'O' to set hilite_status rules, hide the 'score' status field if make stone-to-flesh behave the same on statues of petrified monsters as it does on random 'dungeon art' ones (revive at a nearby spot instead of becoming a corpse when there's already a monster at statue's location) +special level loader didn't support populating several types of special rooms + (ant hole, cockatrice nest, leprechaun hall) Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository diff --git a/src/sp_lev.c b/src/sp_lev.c index a1b1f6d2a..91412d214 100644 --- a/src/sp_lev.c +++ b/src/sp_lev.c @@ -786,10 +786,9 @@ link_doors_rooms() void fill_rooms() { - int tmpi; + int tmpi, m; for (tmpi = 0; tmpi < nroom; tmpi++) { - int m; if (rooms[tmpi].needfill) fill_room(&rooms[tmpi], (rooms[tmpi].needfill == 2)); for (m = 0; m < rooms[tmpi].nsubrooms; m++) @@ -2452,6 +2451,9 @@ boolean prefilled; case COURT: case ZOO: case BEEHIVE: + case ANTHOLE: + case COCKNEST: + case LEPREHALL: case MORGUE: case BARRACKS: fill_zoo(croom); -- 2.40.0