diff options
| author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 20:24:07 +0530 |
|---|---|---|
| committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 20:24:07 +0530 |
| commit | 43d86ff397acfe79b6699845ae4e2ec9a8e485d0 (patch) | |
| tree | 72a76a5ed900aa4ab9465bef1cbd0d7807bbbccd /crawl-ref/source/player.cc | |
| parent | 3f8334b021c123a371f0dfe8062c3a84eebba673 (diff) | |
| parent | 8efdaf11a28299dda120a8afe78702686a6e2a47 (diff) | |
| download | crawl-ref-43d86ff397acfe79b6699845ae4e2ec9a8e485d0.tar.gz crawl-ref-43d86ff397acfe79b6699845ae4e2ec9a8e485d0.zip | |
Merge branch 'shoals++'
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 631e04e622..e490908d1b 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6454,6 +6454,12 @@ int player::res_elec() const return (player_res_electricity() * 2); } +int player::res_water_drowning() const +{ + return (res_asphyx() || + (you.species == SP_MERFOLK && !transform_changed_physiology())); +} + int player::res_asphyx() const { // The undead are immune to asphyxiation, or so we'll assume. @@ -7051,6 +7057,13 @@ bool player::move_to_pos(const coord_def &c) return false; } +void player::apply_location_effects(const coord_def &oldpos, + killer_type killer, + int killernum) +{ + move_player_to_grid(pos(), false, true, true, false); +} + void player::shiftto(const coord_def &c) { crawl_view.shift_player_to(c); |