diff options
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 107c6b07c0..72c7bf26b8 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -253,7 +253,8 @@ bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift, merfolk_start_swimming(); } - else if (!grid_is_water(new_grid) && grid_is_water(old_grid)) + else if (!grid_is_water(new_grid) && grid_is_water(old_grid) + && !is_grid_dangerous(new_grid)) { unmeld_one_equip(EQ_BOOTS); you.redraw_evasion = true; |