diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-06 13:02:53 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-06 13:02:53 +0000 |
| commit | 540e73466ca8473cb46e6539a53b85d41c7a9382 (patch) | |
| tree | e07f6f553145a74b860868cff9af5f0eaceb46b6 /crawl-ref/source/player.cc | |
| parent | 230d9542b2d023d68b21c1533777d22850eeb350 (diff) | |
| download | crawl-ref-540e73466ca8473cb46e6539a53b85d41c7a9382.tar.gz crawl-ref-540e73466ca8473cb46e6539a53b85d41c7a9382.zip | |
[2096874] Player was not being warned when entering shallow water.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6889 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 6b55e10e24..799b038380 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -114,7 +114,8 @@ bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift, // assuming that entering the same square means coming from above (levitate) const bool from_above = (you.pos() == p); - const dungeon_feature_type old_grid = (from_above) ? DNGN_FLOOR : grd(p); + const dungeon_feature_type old_grid = + (from_above) ? DNGN_FLOOR : grd(you.pos()); const dungeon_feature_type new_grid = grd(p); // Really must be clear. @@ -4250,7 +4251,7 @@ bool wearing_amulet(jewellery_type amulet, bool calc_unid) { if ( extrinsic_amulet_effect(amulet) ) return (true); - + if (you.equip[EQ_AMULET] == -1) return (false); |