Recheck the terrain after all transformations, not just dragons, to

handle other forms that fly, such as bats, as well as any future forms 
that may place the player in inhospitable terrain when the 
transformation wears off.


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

1 files changed, 3 insertions, 5 deletions

diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index df10d0562e..8e9887071b 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -712,12 +712,7 @@ void untransform(void)
         mpr( "Your transformation has ended.", MSGCH_DURATION );
         modify_stat(STAT_STRENGTH, -10, true,
                     "losing the dragon transformation" );
-
-        // Re-check terrain now that be may no longer be flying.
-        move_player_to_grid( you.x_pos, you.y_pos, false, true, true );
-
         hp_downscale = 16;
-
         break;
 
     case TRAN_LICH:
@@ -744,6 +739,9 @@ void untransform(void)
         break;
     }
 
+    // Re-check terrain now that be may no longer be flying.
+    move_player_to_grid(you.x_pos, you.y_pos, false, true, true);
+
     if (transform_can_butcher_barehanded(old_form))
         stop_butcher_delay();