From 22e5db9d1ec1a8119185f3806387519195497b1c Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 3 Sep 2007 13:41:30 +0000 Subject: Implementing patch 1772497 (improvement to runrest.lua by zelgadis). Also added notes for getting penance, and small fix (patch 1786893 by dolorous). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2047 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/view.cc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/view.cc') diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index fd31a7edae..dd080ef687 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -907,17 +907,30 @@ void fire_monster_alerts() { if ((player_monster_visible(monster) || mons_was_seen_this_turn(monster)) - && !mons_is_submerged( monster ) - && !mons_friendly( monster )) + && !mons_is_submerged( monster )) { - if (!mons_class_flag( monster->type, M_NO_EXP_GAIN ) + if (!mons_is_safe( static_cast(monster) ) + && !mons_class_flag( monster->type, M_NO_EXP_GAIN ) && !mons_is_mimic( monster->type )) { interrupt_activity( AI_SEE_MONSTER, monster ); } seen_monster( monster ); + + // Monster was viewed this turn + monster->flags |= MF_WAS_IN_VIEW; + } + else + { + // Monster was not viewed this turn + monster->flags &= ~MF_WAS_IN_VIEW; } } + else + { + // Monster was not viewed this turn + monster->flags &= ~MF_WAS_IN_VIEW; + } } monsters_seen_this_turn.clear(); -- cgit v1.2.3-54-g00ecf