Remove duplicate code from the priest promotion function, consolidate

the code to change one monster type into another into its own function, 
and use it.  The code handling net trapping should probably be somewhere 
else, though.


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

3 files changed, 96 insertions, 103 deletions

diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index d804b70484..9d90c2e666 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1305,6 +1305,83 @@ static bool is_poly_power_unsuitable(
     }
 }
 
+/* Change one monster type into another. */
+void monster_change_type(monsters *monster, monster_type targetc)
+{
+    const int old_hp = monster->hit_points;
+    const int old_hp_max = monster->max_hit_points;
+    const bool old_mon_caught = mons_is_caught(monster);
+    const char old_ench_countdown = monster->ench_countdown;
+
+    /* deal with mons_sec */
+    monster->type = targetc;
+    monster->number = MONS_PROGRAM_BUG;
+
+    mon_enchant abj = monster->get_ench(ENCH_ABJ);
+    mon_enchant shifter = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER,
+                                            ENCH_SHAPESHIFTER);
+
+    // Note: define_monster() will clear out all enchantments! -- bwr
+    define_monster( monster_index(monster) );
+
+    monster->add_ench(abj);
+    monster->add_ench(shifter);
+
+    monster->ench_countdown = old_ench_countdown;
+
+    if (mons_class_flag( monster->type, M_INVIS ))
+        monster->add_ench(ENCH_INVIS);
+
+    monster->hit_points = monster->max_hit_points
+                                * ((old_hp * 100) / old_hp_max) / 100;
+
+    monster->fix_speed();
+
+    if (old_mon_caught)
+    {
+        if (monster->body_size(PSIZE_BODY) >= SIZE_GIANT)
+        {
+            int net = get_trapping_net(monster->x, monster->y);
+            if (net != NON_ITEM)
+                destroy_item(net);
+
+            if (see_grid(monster->x, monster->y))
+            {
+                if (player_monster_visible(monster))
+                {
+                    mprf("The net rips apart, and %s comes free!",
+                         monster->name(DESC_NOCAP_THE).c_str());
+                }
+                else
+                {
+                    mpr("All of a sudden the net rips apart!");
+                }
+            }
+        }
+        else if (mons_is_insubstantial(monster->type)
+                 || monster->type == MONS_OOZE
+                 || monster->type == MONS_PULSATING_LUMP)
+        {
+            const int net = get_trapping_net(monster->x, monster->y);
+            if (net != NON_ITEM)
+                remove_item_stationary(mitm[net]);
+
+            if (mons_is_insubstantial(monster->type))
+            {
+                simple_monster_message(monster,
+                                       " drifts right through the net!");
+            }
+            else
+            {
+                simple_monster_message(monster,
+                                       " oozes right through the net!");
+            }
+        }
+        else
+            monster->add_ench(ENCH_HELD);
+    }
+}
+
 /*
  * if targetc == RANDOM_MONSTER then relpower indicates the desired
  * power of the new monster relative to the current monster.
@@ -1318,9 +1395,9 @@ bool monster_polymorph( monsters *monster, monster_type targetc,
     int source_power, target_power, relax;
     int tries = 1000;
 
-    // Used to be mons_power, but that just returns hit_dice 
-    // for the monster class.  By using the current hit dice 
-    // the player gets the opportunity to use draining more 
+    // Used to be mons_power, but that just returns hit_dice
+    // for the monster class.  By using the current hit dice
+    // the player gets the opportunity to use draining more
     // effectively against shapeshifters. -- bwr
     source_power = monster->hit_dice;
     relax = 1;
@@ -1362,7 +1439,7 @@ bool monster_polymorph( monsters *monster, monster_type targetc,
     }
 
     // messaging: {dlb}
-    bool invis = (mons_class_flag( targetc, M_INVIS ) 
+    bool invis = (mons_class_flag( targetc, M_INVIS )
                   || monster->invisible()) && !player_see_invis();
 
     if (monster->has_ench(ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER))
@@ -1394,40 +1471,9 @@ bool monster_polymorph( monsters *monster, monster_type targetc,
     update_beholders(monster, true);
 
     // the actual polymorphing:
-    const int old_hp = monster->hit_points;
-    const int old_hp_max = monster->max_hit_points;
-    const bool old_mon_caught = mons_is_caught(monster);
-    const char old_ench_countdown = monster->ench_countdown;
+    monster_change_type(monster, targetc);
 
-    /* deal with mons_sec */
-    monster->type = targetc;
-    monster->number = MONS_PROGRAM_BUG;
-
-    mon_enchant abj = monster->get_ench(ENCH_ABJ);
-    mon_enchant shifter = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER,
-                                            ENCH_SHAPESHIFTER);
-
-    // Note: define_monster() will clear out all enchantments! -- bwr
-    define_monster( monster_index(monster) );
-
-    monster->add_ench(abj);
-    monster->add_ench(shifter);
-
-    monster->ench_countdown = old_ench_countdown;
-
-    if (mons_class_flag( monster->type, M_INVIS ))
-        monster->add_ench(ENCH_INVIS);
-
-    if (!player_messaged && mons_near(monster)
-        && player_monster_visible(monster))
-    {
-        mprf("%s appears out of thin air!", monster->name(DESC_CAP_A).c_str());
-        player_messaged = true;
-    }
-
-    monster->hit_points = monster->max_hit_points
-                                * ((old_hp * 100) / old_hp_max) / 100
-                                + random2(monster->max_hit_points);
+    monster->hit_points += random2(monster->max_hit_points);
 
     if (monster->hit_points > monster->max_hit_points)
         monster->hit_points = monster->max_hit_points;
@@ -1436,6 +1482,13 @@ bool monster_polymorph( monsters *monster, monster_type targetc,
 
     monster_drop_ething(monster);
 
+    if (!player_messaged && player_monster_visible(monster)
+        && mons_near(monster))
+    {
+        player_messaged = true;
+        mprf("%s appears out of thin air!", monster->name(DESC_CAP_A).c_str());
+    }
+
     // New monster type might be interesting
     mark_interesting_monst(monster);
 
@@ -1443,50 +1496,6 @@ bool monster_polymorph( monsters *monster, monster_type targetc,
     if (player_monster_visible(monster) && mons_near(monster))
         seen_monster(monster);
 
-    if (old_mon_caught)
-    {
-        if (monster->body_size(PSIZE_BODY) >= SIZE_GIANT)
-        {
-            int net = get_trapping_net(monster->x, monster->y);
-            if (net != NON_ITEM)
-                destroy_item(net);
-
-            if (see_grid(monster->x, monster->y))
-            {
-                if (player_monster_visible(monster))
-                {
-                    mprf("The net rips apart, and %s comes free!",
-                         monster->name(DESC_NOCAP_THE).c_str());
-                }
-                else
-                {
-                    mpr("All of a sudden the net rips apart!");
-                }
-            }
-        }
-        else if (mons_is_insubstantial(monster->type)
-                 || monster->type == MONS_OOZE
-                 || monster->type == MONS_PULSATING_LUMP)
-        {
-            const int net = get_trapping_net(monster->x, monster->y);
-            if (net != NON_ITEM)
-                remove_item_stationary(mitm[net]);
-                
-            if (mons_is_insubstantial(monster->type))
-            {
-                simple_monster_message(monster,
-                                       " drifts right through the net!");
-            }
-            else
-            {
-                simple_monster_message(monster,
-                                       " oozes right through the net!");
-            }
-        }
-        else
-            monster->add_ench(ENCH_HELD);
-    }
-    
     return (player_messaged);
 }                                        // end monster_polymorph()
 
@@ -1497,7 +1506,7 @@ bool monster_blink(monsters *monster)
     {
         unwind_var<env_show_grid> visible_grid( env.show );
         losight(env.show, grd, monster->x, monster->y, true);
-    
+
         if (!random_near_space(monster->x, monster->y, nx, ny,
                                false, true))
             return (false);
diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h
index 5e6c24697d..622c7d587f 100644
--- a/crawl-ref/source/monstuff.h
+++ b/crawl-ref/source/monstuff.h
@@ -62,6 +62,9 @@ enum poly_power_type {
     PPT_MORE,
     PPT_SAME
 };
+
+void monster_change_type(monsters *monster, monster_type targetc);
+
 bool monster_polymorph(monsters *monster, monster_type targetc,
                        poly_power_type p = PPT_SAME);
 
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 9804abfb6f..59e2b6ffe6 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -765,31 +765,12 @@ static bool promote_to_priest(monsters* mon)
     if (priest_type != MONS_PROGRAM_BUG)
     {
         // Turn an ordinary monster into a priestly monster, preserving
-        // important characteristics.  Keep this as generic as possible,
-        // in case more promotions are added.
+        // the flags.
         const unsigned long old_flags = mon->flags;
-        const int old_hp = mon->hit_points;
-        const int old_hp_max = mon->max_hit_points;
-        const char old_ench_countdown = mon->ench_countdown;
-        mon_enchant abj = mon->get_ench(ENCH_ABJ);
-        mon_enchant shifter = mon->get_ench(ENCH_GLOWING_SHAPESHIFTER,
-                                            ENCH_SHAPESHIFTER);
-        const bool old_mon_caught = mons_is_caught(mon);
 
-        mon->type = priest_type;
-        define_monster(monster_index(mon));
+        monster_change_type(mon, priest_type);
 
         mon->flags = old_flags;
-        mon->hit_points = mon->max_hit_points *
-            ((old_hp * 100) / old_hp_max) / 100;
-        mon->ench_countdown = old_ench_countdown;
-        mon->add_ench(abj);
-        mon->add_ench(shifter);
-        if (old_mon_caught)
-            mon->add_ench(ENCH_HELD);
-        if (mons_class_flag(mon->type, M_INVIS))
-            mon->add_ench(ENCH_INVIS);
-        mon->fix_speed();
 
         return true;
     }