Cleaned up monster generation functions, separate monster zombie type from monster number. May be buggy.

Allow hydra zombies (they currently do not get the right number of heads).


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

1 files changed, 6 insertions, 6 deletions

diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index b1e2741ef5..b53669672a 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -433,11 +433,12 @@ void area_shift(void)
 
     xom_check_nearness();
 
+    mgen_data mons;
+    mons.level_type = LEVEL_ABYSS;
+    mons.proximity  = PROX_AWAY_FROM_PLAYER;
+    
     for (unsigned int mcount = 0; mcount < 15; mcount++)
-    {
-        mons_place( RANDOM_MONSTER, BEH_HOSTILE, MHITNOT, false, 1, 1,
-                    LEVEL_ABYSS, PROX_AWAY_FROM_PLAYER ); // PROX_ANYWHERE?
-    }
+        mons_place(mons);
 
     // And allow monsters in transit another chance to return.
     place_transiting_monsters();
@@ -599,8 +600,7 @@ static bool spawn_corrupted_servant_near(const coord_def &pos)
             one_chance_in(5 + you.skills[SK_INVOCATIONS] / 4)?
             BEH_HOSTILE : BEH_NEUTRAL;
         const int mid =
-            create_monster( mons, 5, beh, p.x, p.y, MHITNOT, MONS_PROGRAM_BUG );
-
+            create_monster( mgen_data( mons, beh, 5, p ) );
         return (mid != -1);
     }
     return (false);