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.

1 files changed, 8 insertions, 6 deletions

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);