fiddlerwoaroof/crawl - Change QOJFTXZN6Y2DLDRZEYA6KAUH2DR42DKBDH6L4IBILTLGXHZCM3GQC

Fix torment_player() crashing when Xom was the source of the torment.

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

Created by zelgadis on January 16, 2009

QOJFTXZN6Y2DLDRZEYA6KAUH2DR42DKBDH6L4IBILTLGXHZCM3GQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/effects.cc at line 186 [4.3382105]

B:BD[3.3596] → [3.3596:3616]

    if (caster < 0)

[3.3596]

[3.3616]

    kill_method_type type = KILLED_BY_MONSTER;
    if (invalid_monster_index(caster))

Insertion in crawl-ref/source/effects.cc at line 189 [4.3382105]

[3.3622]

        type = KILLED_BY_SOMETHING;
        if (crawl_state.is_god_acting())
            type = KILLED_BY_DIVINE_WRATH;

Replacement in crawl-ref/source/effects.cc at line 211 [4.3382105]

B:BD[2.2877] → [2.2877:2912]

            aux = "Xom's torment";

[2.2877]

[3.4050]

            type = KILLED_BY_XOM;
            aux  = "Xom's torment";

Replacement in crawl-ref/source/effects.cc at line 217 [4.3382105]

B:BD[3.4121] → [3.4121:4285]

    ouch(hploss, caster, (caster != TORMENT_GENERIC) ? KILLED_BY_MONSTER
                                                     : KILLED_BY_SOMETHING,
         aux);

[3.4121]

[3.4285]

    ouch(hploss, caster, type, aux);