summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/acr.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-25 19:58:57 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-25 19:58:57 +0000
commit304f59e923fea980d145397d57af5f0979936aef (patch)
treec0f0de3716b5cd4e22ba67c4c93b7d649c541b07 /crawl-ref/source/acr.cc
parenta9b549f307cc59d71aac975e207f1203ebdff489 (diff)
downloadcrawl-ref-304f59e923fea980d145397d57af5f0979936aef.tar.gz
crawl-ref-304f59e923fea980d145397d57af5f0979936aef.zip
Allow player to cancel stepping into a dangerous place when it's done
by swapping places with a monster. Fixes [2535944]. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8748 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r--crawl-ref/source/acr.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index a990d8daaa..151c8e4fb2 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -4273,7 +4273,7 @@ static void _move_player(coord_def move)
{
you.time_taken *= player_movement_speed();
you.time_taken /= 10;
- if (!move_player_to_grid(targ, true, false, swap, swap))
+ if (!move_player_to_grid(targ, true, false, false, swap))
return;
if (swap)