diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 21:29:46 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 21:29:46 +0000 |
| commit | ed2216e8f9a93c5ba091659fd5e4ee5750187e80 (patch) | |
| tree | 7b9d050f00d0d608ace9c00303e29a5501f30605 /crawl-ref/source/item_use.cc | |
| parent | abceff13c3921aa10542fb3079abb3ba113ece41 (diff) | |
| download | crawl-ref-ed2216e8f9a93c5ba091659fd5e4ee5750187e80.tar.gz crawl-ref-ed2216e8f9a93c5ba091659fd5e4ee5750187e80.zip | |
Fix 2028969: excess comma in autoinscriptions of brand-only artefacts.
Also: Tweak inscription prompt.
Fix 2027600: Don't prompt when attacking with inappropriate weapon while
confused.
Fix 2027328: Throwing projectiles at enslaved monsters.
When saccing to Nemelex, count chunks and !blood like corpses (deck of
summoning rather than wonder). Chunks used to be ignored completely but
since they're just chopped up corpses and corpses are worth much more
than 4 per piece I don't think it hurts. (Rotten chunks have a value of
zero.) Also, decrease !blood price to that of !porridge and lower.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6700 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 6d541d6951..ec6c9938fa 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1910,7 +1910,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, // Should only happen if the player answered 'n' to one of those // "Fire through friendly?" prompts. - if (pbolt.fr_count > 0 || pbolt.beam_cancelled) + if (pbolt.beam_cancelled) { canned_msg(MSG_OK); you.turn_is_over = false; |