diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 12:54:36 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 12:54:36 +0000 |
commit | 8b4814cda94ce0ba5d627b4ae572077dcf55ccda (patch) | |
tree | ad912dbac17407d32bdaab7fbe668513983cd752 /crawl-ref/source/item_use.cc | |
parent | b2ea4771ba60b92574d31a7cbb628323a5eb8897 (diff) | |
download | crawl-ref-8b4814cda94ce0ba5d627b4ae572077dcf55ccda.tar.gz crawl-ref-8b4814cda94ce0ba5d627b4ae572077dcf55ccda.zip |
Fix 1986252: double "Blech! You need xy!" message
Fix 1966204: make non-amphibious undead capable of drowning or the
equivalent thereof
When you see a weapon with the returning ego return (to you or a
monster) set the properties known along with the brand (because
artefacts can't be id'd by throwing alone, anyway). This helps
alleviate BR 1958616, but doesn't solve the problem with the curse
status being unknown.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5499 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r-- | crawl-ref/source/item_use.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 34c11516dd..7b95625f88 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1747,8 +1747,8 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, int exHitBonus = 0, exDamBonus = 0; // 'extra' bonus from skill/dex/str int effSkill = 0; // effective launcher skill int dice_mult = 100; - bool returning = false; // item can return to pack - bool did_return = false; // returning item actually does return to pack + bool returning = false; // Item can return to pack. + bool did_return = false; // Returning item actually does return to pack. int slayDam = 0; if (!teleport) @@ -2538,7 +2538,12 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, // Player saw the item return. if (!is_artefact(you.inv[throw_2])) - set_ident_flags(you.inv[throw_2], ISFLAG_KNOW_TYPE); + { + // Since this only happens for non-artefacts, also mark properties + // as known. + set_ident_flags(you.inv[throw_2], + ISFLAG_KNOW_TYPE | ISFLAG_KNOW_PROPERTIES); + } } else { |