From d775567ab5dcdba8bb73b0f9771f84a0258e3405 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 4 Nov 2007 20:19:28 +0000 Subject: Renaming Portal Vaults to Bazaars. [FR 1824984] Fix 1825526: not stepping into deep water costing a turn Fix 1825352: ?torment only being unholy if it wasn't known git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2753 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/acr.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/acr.cc') diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index b868e61bee..020bc11f50 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -3760,7 +3760,8 @@ static void move_player(int move_x, int move_y) { you.time_taken *= player_movement_speed(); you.time_taken /= 10; - move_player_to_grid(targ_x, targ_y, true, false, swap); + if (!move_player_to_grid(targ_x, targ_y, true, false, swap)) + return; if (you.mutation[MUT_DRIFTING] && (random2(100) <= you.mutation[MUT_DRIFTING] * 5) ) -- cgit v1.2.3-54-g00ecf