From 304f59e923fea980d145397d57af5f0979936aef Mon Sep 17 00:00:00 2001 From: haranp Date: Sun, 25 Jan 2009 19:58:57 +0000 Subject: 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 --- crawl-ref/source/acr.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3-54-g00ecf