More steps toward ziggurats.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7553 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 14 insertions, 10 deletions

diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index 48f43a7b76..49769d06e4 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -262,6 +262,12 @@ void spawn_random_monsters()
     // No monsters in the Labyrinth, or the Ecumenical Temple, or in Bazaars.
 }
 
+monster_type pick_random_monster(const level_id &place)
+{
+    int level = place.absdepth();
+    return pick_random_monster(place, level, level);
+}
+
 monster_type pick_random_monster(const level_id &place, int power,
                                  int &lev_mons)
 {
@@ -1906,16 +1912,14 @@ int mons_place( mgen_data mg )
     // Translate level_type.
     switch (mg.level_type)
     {
-        case LEVEL_PANDEMONIUM:
-            mg.power = 52;     // sigh..
-            break;
-        case LEVEL_ABYSS:
-            mg.power = 51;
-            break;
-        case LEVEL_DUNGEON:
-        default:
-            mg.power = you.your_level;
-            break;
+    case LEVEL_PANDEMONIUM:
+    case LEVEL_ABYSS:
+        mg.power = level_id(mg.level_type).absdepth();
+        break;
+    case LEVEL_DUNGEON:
+    default:
+        mg.power = you.your_level;
+        break;
     }
 
     int mid = place_monster(mg);