From b42076112cdb1dae1b89db48d25dbedce48c9ad1 Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Sat, 28 Nov 2009 14:21:37 +1000 Subject: Make '8' and '9' obey random monster list in portal vaults. Move the set_vault_mon_list code out of dgn_register_place, as that function is called after the random monsters are picked. Hopefully, this also does not cause any future problems. --- crawl-ref/source/dungeon.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/dungeon.cc') diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 3a7c88010f..a5c0238d93 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -858,12 +858,6 @@ void dgn_register_place(const vault_placement &place, bool register_vault) set_level_flags(place.map.level_flags.flags_set, true); unset_level_flags(place.map.level_flags.flags_unset, true); - if (place.map.random_mons.size() > 0) - { - ASSERT(you.level_type == LEVEL_PORTAL_VAULT); - set_vault_mon_list(place.map.random_mons); - } - if (place.map.floor_colour != BLACK) env.floor_colour = place.map.floor_colour; @@ -4468,6 +4462,14 @@ static bool _build_vaults(int level_number, const map_def *vault, if (gluggy == MAP_NONE) return (false); + // XXX: Moved this out of dgn_register_place so that vault-set monsters can + // be accessed with the '9' and '8' glyphs. (due) + if (place.map.random_mons.size() > 0) + { + ASSERT(you.level_type == LEVEL_PORTAL_VAULT); + set_vault_mon_list(place.map.random_mons); + } + place.apply_grid(); dgn_register_place(place, true); -- cgit v1.2.3-54-g00ecf