fiddlerwoaroof/crawl - Change OO3IWSSYZ4XYEPAGLQW4YBX2CBPRTHLIAYEFOPC3I6DEQHPK24YQC

Fix crash with holy word scrolls.

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

Created by dolorous on January 19, 2009

OO3IWSSYZ4XYEPAGLQW4YBX2CBPRTHLIAYEFOPC3I6DEQHPK24YQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/effects.cc at line 78 [3.3382105]

B:BD[2.3095] → [2.3095:3115]

    if (caster < 0)

[2.3095]

[4.6326]

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

Insertion in crawl-ref/source/effects.cc at line 81 [3.3382105]

[4.6332]

[2.3116]

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

Replacement in crawl-ref/source/effects.cc at line 101 [3.3382105]

B:BD[4.6548] → [2.3295:3456]

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

[4.6548]

[3.3382866]

    ouch(hploss, caster, type, aux);