Get rid of mgen_data.power, use place for that.

There's still a lot of use of monster_level inside monster selection, but
at least the external interface should be free of it.

ZotDef is handled by a hack, might be wrong -- beware.

1 files changed, 2 insertions, 8 deletions

diff --git a/crawl-ref/source/mgen_data.h b/crawl-ref/source/mgen_data.h
index 2a7f66d744..f5cef88942 100644
--- a/crawl-ref/source/mgen_data.h
+++ b/crawl-ref/source/mgen_data.h
@@ -77,11 +77,6 @@ struct mgen_data
     // The colour of the monster.
     int             colour;
 
-    // A measure of how powerful the generated monster should be (for
-    // randomly chosen monsters), usually equal to the absolute depth
-    // that the player is in the dungeon.
-    int             power;
-
     // How close to or far from the player the monster should be created.
     // Is usually used only when the initial position (pos) is unspecified.
     proximity_type  proximity;
@@ -130,7 +125,6 @@ struct mgen_data
               monster_type base = MONS_NO_MONSTER,
               int monnumber = 0,
               int moncolour = BLACK,
-              int monpower = -1,
               proximity_type prox = PROX_ANYWHERE,
               level_id _place = level_id::current(),
               int mhd = 0, int mhp = 0,
@@ -143,7 +137,7 @@ struct mgen_data
           abjuration_duration(abj), summon_type(st), pos(p),
           preferred_grid_feature(DNGN_UNSEEN), foe(mfoe), flags(genflags),
           god(which_god), number(monnumber), colour(moncolour),
-          power(monpower), proximity(prox), place(_place), map_mask(0),
+          proximity(prox), place(_place), map_mask(0),
           hd(mhd), hp(mhp), extra_flags(extflags), mname(monname),
           non_actor_summoner(nas), initial_shifter(is), props()
     {
@@ -184,7 +178,7 @@ struct mgen_data
     {
         return mgen_data(mt, BEH_HOSTILE, 0, abj, st, p,
                          alert ? MHITYOU : MHITNOT,
-                         genflags, ngod, base, 0, BLACK, -1,
+                         genflags, ngod, base, 0, BLACK,
                          PROX_ANYWHERE, level_id::current(), 0, 0, 0, "", nsummoner,
                          RANDOM_MONSTER);
     }