diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-16 19:57:43 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-16 19:57:43 +0000 |
| commit | 7c84d174a0e077e2582a3bdbda5ed6c3b84f7787 (patch) | |
| tree | 051bb89602d3f1e0ac8d58618c8e9d2ed0835f18 | |
| parent | 602c6953c99c8ebc63b3243ab791b02ddb4ac7c6 (diff) | |
| download | crawl-ref-7c84d174a0e077e2582a3bdbda5ed6c3b84f7787.tar.gz crawl-ref-7c84d174a0e077e2582a3bdbda5ed6c3b84f7787.zip | |
Backport fix for artefact boots' stat boosts stacking when attempting to
move from water to lava as a Merfolk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10689 c06c8d41-db1a-0410-9941-cceddc491573
| -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; |