Don't leak item information when targetting monsters with agony or hibernation

Recent changes to tracers meant that monsters whose rN+ or rC+ came
solely from equipment would still be considered invalid targets for
those spells, even when the player had no way to know they were
immune. Now the tracer only considers intrinsic resistances when
determining validity for these effects.

1 files changed, 7 insertions, 3 deletions

diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc
index bcd59d5207..2db9fa1280 100644
--- a/crawl-ref/source/actor.cc
+++ b/crawl-ref/source/actor.cc
@@ -158,7 +158,7 @@ void actor::set_position(const coord_def &c)
     areas_actor_moved(this, oldpos);
 }
 
-bool actor::can_hibernate(bool holi_only) const
+bool actor::can_hibernate(bool holi_only, bool intrinsic_only) const
 {
     // Undead, nonliving, and plants don't sleep.
     const mon_holy_type holi = holiness();
@@ -172,11 +172,15 @@ bool actor::can_hibernate(bool holi_only) const
             return false;
 
         // The monster is cold-resistant and can't be hibernated.
-        if (res_cold() > 0)
+        if (intrinsic_only && is_monster()
+                ? get_mons_resist(this->as_monster(), MR_RES_COLD)
+                : res_cold() > 0)
+        {
             return false;
+        }
 
         // The monster has slept recently.
-        if (is_monster()
+        if (is_monster() && !intrinsic_only
             && static_cast<const monster* >(this)->has_ench(ENCH_SLEEP_WARY))
         {
             return false;