fiddlerwoaroof/crawl - Change OJSHASLCO3MS5WZKQ5CD5CUNP6LDOJ2BM7RILHFJPQYX2GUG24IAC

Oops, forgot to remove "@to_foe@" and "@at_foe@" when the target of the monster

message is the player.

When ENCH_ABJ times out and a new ENCH_ABJ is put back in before calling monster_die(), set it's duration to -1 so that monster_die() can tell that the monster "died" from being abjured or having its time run out.

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

Created by zelgadis on January 5, 2009

OJSHASLCO3MS5WZKQ5CD5CUNP6LDOJ2BM7RILHFJPQYX2GUG24IAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 6458 [5.1699344]

B:BD[3.16922] → [4.13053:13094]

        add_ench(mon_enchant(ENCH_ABJ));

[3.16922]

[6.2818]

        // Set duration to -1 so that monster_die() and any of its
        // callees can tell that the monster ran out of time or was
        // abjured.
        add_ench(mon_enchant(ENCH_ABJ, 0, KC_OTHER, -1));

Insertion in crawl-ref/source/mon-util.cc at line 7974 [5.1699344]

[2.12123]


        msg = replace_all(msg, " @to_foe@", "");
        msg = replace_all(msg, " @at_foe@", "");