diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-23 09:53:41 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-23 09:53:41 +0000 |
| commit | d40b5c49a223cb2bdad1e9a0df10631140b700a3 (patch) | |
| tree | 1ce05afb305aafd41354bba5e853ea79796a819a /crawl-ref/source/spells3.cc | |
| parent | 2487cbfe7787fdd3d8908ec9ad384fbebf30ac9a (diff) | |
| download | crawl-ref-d40b5c49a223cb2bdad1e9a0df10631140b700a3.tar.gz crawl-ref-d40b5c49a223cb2bdad1e9a0df10631140b700a3.zip | |
* Fix Xom gifts not going Splash! in deep water.
* Limit Xom tele rounds to a maximum of 12 (unlikely, but you know...)
* Update player doll for Merfolk entering/leaving water.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10379 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells3.cc')
| -rw-r--r-- | crawl-ref/source/spells3.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 3a815e32e8..cd5913a85e 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1308,6 +1308,9 @@ static bool _teleport_player( bool allow_control, bool new_abyss_area ) coord_def pos(1, 0); bool large_change = false; bool check_ring_TC = false; +#ifdef USE_TILE + const dungeon_feature_type old_grid = grd(you.pos()); +#endif if (is_controlled) { @@ -1457,6 +1460,18 @@ static bool _teleport_player( bool allow_control, bool new_abyss_area ) if (check_ring_TC) maybe_id_ring_TC(); +#ifdef USE_TILE + if (you.species == SP_MERFOLK) + { + const dungeon_feature_type new_grid = grd(you.pos()); + if (grid_is_water(old_grid) && !grid_is_water(new_grid) + || !grid_is_water(old_grid) && grid_is_water(new_grid)) + { + init_player_doll(); + } + } +#endif + return !is_controlled; } |