diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-04 20:19:28 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-04 20:19:28 +0000 |
| commit | d775567ab5dcdba8bb73b0f9771f84a0258e3405 (patch) | |
| tree | 2cc979dcbde36fc83bef4f3d4582a83d788aae67 /crawl-ref/source/acr.cc | |
| parent | ed3c1104bb7225a287b90ec804bd899e8a378aba (diff) | |
| download | crawl-ref-d775567ab5dcdba8bb73b0f9771f84a0258e3405.tar.gz crawl-ref-d775567ab5dcdba8bb73b0f9771f84a0258e3405.zip | |
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
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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) ) |