Added "items" boolean parameter to the player_res_foo() functions, which

when false makes equipped items be ignored when figuring reistance.  Used
by is_useless_item() to avoid (for example) rings of poison reistance being
marked useless if the player equips one.  Also mark rings of teleport
control as useless if the player has inate teleport control, and never
mark artifact jewellery as useless.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5725 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 1 deletions

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 7e7a897242..41fabbd8bc 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -2427,6 +2427,9 @@ bool is_useless_item(const item_def &item, bool temp)
         if (!item_type_known(item))
             return (false);
 
+        if (is_artefact(item))
+            return false;
+
         if (is_bad_item(item, temp))
             return (true);
 
@@ -2450,7 +2453,7 @@ bool is_useless_item(const item_def &item, bool temp)
             return (player_mutation_level(MUT_ACUTE_VISION));
 
         case RING_POISON_RESISTANCE:
-            return (player_res_poison()
+            return (player_res_poison(true, temp, false)
                     && (temp || you.species != SP_VAMPIRE));
 
         case AMU_CONTROLLED_FLIGHT:
@@ -2459,6 +2462,9 @@ bool is_useless_item(const item_def &item, bool temp)
         case RING_WIZARDRY:
             return (you.religion == GOD_TROG);
 
+        case RING_TELEPORT_CONTROL:
+            return (player_control_teleport(true, temp, false));
+
         default:
             return (false);
         }