fiddlerwoaroof/crawl - Change SEYFLCMBTBFOX6UL76JKYIXN7PSORCCUXUMU2YPW3IKZ3655ZRNAC

Oops, don't let pets swap or be swapped with other monsters if the

player explictly told them to attack monsters in spite of sanctuary.

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

Created by zelgadis on July 2, 2008

SEYFLCMBTBFOX6UL76JKYIXN7PSORCCUXUMU2YPW3IKZ3655ZRNAC

Dependencies

[2] NCRXRQNCAMQQOZCL7TBMKGM6TOGDAHR3GRXAVVB26FLGE2KUZC2QC
[3] K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 5688 [3.1396662]

[2.3297]

    {
        return false;
    }
    // Don't swap places if the player explicitly ordered their pet
    // to attack monsters.
    if ((mons_friendly(mover) || mons_friendly(moved))
        && you.pet_target != MHITYOU && you.pet_target != MHITNOT)