From 8fa489224d0d8753d73ddf8f60c9b6ae52ca479d Mon Sep 17 00:00:00 2001 From: Jared Tinney (Twinge) Date: Mon, 22 Feb 2010 12:04:47 -0800 Subject: [PATCH] Scrolls of Detect Curse now always ID when read. --- crawl-ref/source/item_use.cc | 3 +-- crawl-ref/source/spells3.cc | 17 ++--------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 070a4da..e587754 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -5532,8 +5532,7 @@ void read_scroll(int slot) break; case SCR_DETECT_CURSE: - if (!detect_curse(false)) - id_the_scroll = false; + detect_curse(false); break; case SCR_ACQUIREMENT: diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 2af7ac1..718b310 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -176,8 +176,6 @@ bool remove_curse(bool suppress_msg) bool detect_curse(bool suppress_msg) { - bool success = false; // whether or not any curses found {dlb} - for (int i = 0; i < ENDOFPACK; i++) { item_def& item = you.inv[i]; @@ -186,24 +184,13 @@ bool detect_curse(bool suppress_msg) && (item.base_type == OBJ_WEAPONS || item.base_type == OBJ_ARMOUR || item.base_type == OBJ_JEWELLERY)) - { - if (!item_ident(item, ISFLAG_KNOW_CURSE)) - success = true; - set_ident_flags(item, ISFLAG_KNOW_CURSE); - } } - // messaging output {dlb}: if (!suppress_msg) - { - if (success) - mpr("You sense the presence of curses on your possessions."); - else - canned_msg(MSG_NOTHING_HAPPENS); - } + mpr("Your items softly glow as they are inspected for curses."); - return (success); + return (true); } bool cast_smiting(int power, const coord_def& where) -- 1.6.5.1