diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-10 19:56:36 -0700 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-10 19:56:57 -0700 |
| commit | 26a88daec5cbddc2b0fee517283943e43f1eb93a (patch) | |
| tree | 268052cbd45989525c1b5738b1dead73a95d09e7 /crawl-ref/source/player.cc | |
| parent | 2d02254e2a32210f89c273abe4282c7d6b6b1b23 (diff) | |
| download | crawl-ref-26a88daec5cbddc2b0fee517283943e43f1eb93a.tar.gz crawl-ref-26a88daec5cbddc2b0fee517283943e43f1eb93a.zip | |
Simplify. (Grunt)
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index f562198872..2a3497e1db 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -426,14 +426,7 @@ void moveto_location_effects(dungeon_feature_type old_feat, // Terrain effects. if (is_feat_dangerous(new_grid)) - { - // Lava and dangerous deep water (ie not merfolk). - const coord_def& entry = (stepped) ? old_pos : you.pos(); - - // If true, we were shifted and so we're done. - if (fall_into_a_pool(entry, new_grid)) - return; - } + fall_into_a_pool(new_grid); if (you.ground_level()) { |