diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-24 16:13:54 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-24 16:13:54 +0000 |
| commit | 9e0e937aa69c91a0b299a8f561564776bf2ab153 (patch) | |
| tree | 518a1d46db4280ac5bfd7dce034f0ebc62a251a4 /crawl-ref/source/acr.cc | |
| parent | 9bec932ccdd73db4bab274c36acf0cb9de818b88 (diff) | |
| download | crawl-ref-9e0e937aa69c91a0b299a8f561564776bf2ab153.tar.gz crawl-ref-9e0e937aa69c91a0b299a8f561564776bf2ab153.zip | |
Fix 1923913: blood spattering into fountains
Fix 1923487: jewelled helmets getting the "jewelled" randart description
Fix 1923471: Suppress the beholding message if only attacking.
Also remove ARM_HELM since it's identical in every way with ARM_HELMET
and only serves to confuse coders.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3858 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 1793552274..b7b440ea8f 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -4167,7 +4167,7 @@ static void move_player(int move_x, int move_y) you.turn_is_over = 0; crawl_state.cancel_cmd_repeat(); } - else if (beholder) + else if (beholder && !attacking) { mprf("You cannot move away from %s!", beholder->name(DESC_NOCAP_THE, true).c_str()); |