fiddlerwoaroof/crawl - Change 7Y26W23LYFDU2XAMJF2XOIIQA2EEMGHG2YN72QRVN2UCDUVK3GDQC

Refix charm check so interrupt is not fired for monsters not in view.

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

Created by dshaligram on June 3, 2007

7Y26W23LYFDU2XAMJF2XOIIQA2EEMGHG2YN72QRVN2UCDUVK3GDQC

Dependencies

[2] ITQ2EXDFLN3EHCURKYHZYVWFACD4KW7NA6CMHNKGWTDKHCHQAE6AC
[3] X5WLJCJVW55SXZVP7IKP7ADCJIGNKN4PKAXFECVR6TNK7XSMZR7QC
[4] K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 3026 [4.1699344]

B:BD[3.16294] → [2.218:371]

        // and fire activity interrupts
        interrupt_activity(AI_SEE_MONSTER,
                           activity_interrupt_data(this, "uncharm"));

[3.16294]

[2.371]

        if (mons_near(this) && player_monster_visible(this))
        {
            // and fire activity interrupts
            interrupt_activity(AI_SEE_MONSTER,
                               activity_interrupt_data(this, "uncharm"));
        }