summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-10 15:40:23 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-10 15:40:23 +0000
commit95ce531af9061f57ed7a637c6c66e2737ac9abc5 (patch)
tree797d5dec8d053f13bd2008b79533162061d984d0 /crawl-ref/source/item_use.cc
parentc429af832bab688c0734a49b81447400068d657c (diff)
downloadcrawl-ref-95ce531af9061f57ed7a637c6c66e2737ac9abc5.tar.gz
crawl-ref-95ce531af9061f57ed7a637c6c66e2737ac9abc5.zip
Fix [1939288]: Don't display the "fails to return" message if you throw
a weapon of returning, it doesn't return, and you don't know that it's a weapon of returning. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4176 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index dec8fc2c54..966c8cd1ac 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2607,7 +2607,8 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
}
else
{
- if (returning) // should have returned but didn't
+ // should have returned but didn't
+ if (returning && item_type_known(you.inv[throw_2]))
msg::stream << item.name(DESC_CAP_THE)
<< " fails to return to your pack!" << std::endl;
@@ -2685,8 +2686,8 @@ void jewellery_wear_effects(item_def &item)
randart_prop_type fake_rap = RAP_NUM_PROPERTIES;
bool learn_pluses = false;
- // Randart jewellery shouldn't auto-ID just because the
- // base type is known. Somehow the player should still
+ // Randart jewellery shouldn't auto-ID just because the
+ // base type is known. Somehow the player should still
// be told, preferably by message. (jpeg)
const bool artefact = is_random_artefact( item );
const bool known_pluses = item_ident( item, ISFLAG_KNOW_PLUSES );