fiddlerwoaroof/crawl - Change CSC3SNU2QMWV5MJL6L2DJIQ5W7V3XXMZM6VULPSENTOT7R4DFQKAC

Split the routine to use holy word on only the player into its own

function, too, just in case.

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

Created by dolorous on April 28, 2008

CSC3SNU2QMWV5MJL6L2DJIQ5W7V3XXMZM6VULPSENTOT7R4DFQKAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/effects.h at line 103 [5.3378996]
[4.5915]
[4.5915]
```
bool holy_word_player(int pow, int caster);
```
Replacement in crawl-ref/source/effects.cc at line 67 [5.3382105]
B:BD[4.5978] → [4.5978:6027]
```
bool holy_word(int pow, int caster, bool silent)
```
[4.5978]
[4.6027]
```
bool holy_word_player(int pow, int caster)
```

Replacement in crawl-ref/source/effects.cc at line 69 [5.3382105]

B:BD[4.6029] → [4.6029:6063]

B:BD[4.6063] → [2.5630:5653]

    bool holy_influenced = false;
    monsters *monster;

[4.6029]

[4.6093]

    if (!you.is_undead && you.species != SP_DEMONSPAWN)
        return false;

Replacement in crawl-ref/source/effects.cc at line 72 [5.3382105]

B:BD[4.6094] → [4.6094:6162]

    if (!silent)
        mpr("You speak a Word of immense power!");

[4.6094]

[4.6162]

    int hploss = you.hp / 2 - 1;

Replacement in crawl-ref/source/effects.cc at line 74 [5.3382105]

B:BD[4.6163] → [4.6163:6270]

    // doubt this will ever happen, but it's here as a safety -- bwr
    if (pow > 300)
        pow = 300;

[4.6163]

[4.6270]

    if (hploss >= you.hp)
        hploss = you.hp - 1;
    if (hploss < 0)
        hploss = 0;

Replacement in crawl-ref/source/effects.cc at line 79 [5.3382105]

B:BD[4.6271] → [4.6271:6326]

    if (you.is_undead || you.species == SP_DEMONSPAWN)

[4.6271]

[4.6326]

    if (!hploss)
        return false;
    mpr("You are blasted by holy energy!");
    const char *aux = "holy word";
    if (caster < 0)

Replacement in crawl-ref/source/effects.cc at line 88 [5.3382105]

B:BD[4.6332] → [4.6332:6480]

        int hploss = you.hp / 2 - 1;
        if (hploss >= you.hp)
            hploss = you.hp - 1;
        if (hploss < 0)
            hploss = 0;

[4.6332]

[4.6480]

        switch (caster)
        {
        case HOLY_WORD_SCROLL:
            aux = "scroll of holy word";
            break;
        }

Replacement in crawl-ref/source/effects.cc at line 95 [5.3382105]

B:BD[4.6481] → [4.6481:6547]

        if (hploss)
        {
            holy_influenced = true;

[4.6481]

[4.6547]

        caster = HOLY_WORD_GENERIC;
    }

Replacement in crawl-ref/source/effects.cc at line 98 [5.3382105]

B:BD[4.6548] → [4.6548:6600]

            mpr("You are blasted by holy energy!");

[4.6548]

[5.3382866]

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

Replacement in crawl-ref/source/effects.cc at line 103 [5.3382105]
B:BD[5.3382867] → [4.6601:6644]
```
            const char *aux = "holy word";
```
[5.3382867]
[3.2719]
```
    return true;
}
```

Replacement in crawl-ref/source/effects.cc at line 106 [5.3382105]

∅:D[3.2720] → [4.6644:6869]

B:BD[4.6644] → [4.6644:6869]

            if (caster < 0)
            {
                switch (caster)
                {
                case HOLY_WORD_SCROLL:
                    aux = "scroll of holy word";
                    break;
                }

[3.2720]

[3.2721]

bool holy_word(int pow, int caster, bool silent)
{
    if (!silent)
        mpr("You speak a Word of immense power!");

Replacement in crawl-ref/source/effects.cc at line 111 [5.3382105]

∅:D[3.2722] → [4.6869:6927]

B:BD[4.6869] → [4.6869:6927]

                caster = HOLY_WORD_GENERIC;
            }

[3.2722]

[3.2723]

    // doubt this will ever happen, but it's here as a safety -- bwr
    if (pow > 300)
        pow = 300;

Replacement in crawl-ref/source/effects.cc at line 115 [5.3382105]

∅:D[3.2724] → [4.6927:6960]

B:BD[4.6927] → [4.6927:6960]

B:BD[4.6960] → [3.2725:2885]

∅:D[3.2885] → [4.7125:7141]

B:BD[4.7125] → [4.7125:7141]

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

[3.2724]

[4.7141]

    bool holy_influenced = holy_word_player(pow, caster);

Replacement in crawl-ref/source/effects.cc at line 119 [5.3382105]
B:BD[4.7194] → [4.7194:7223]
```
        monster = &menv[tu];
```
[4.7194]
[4.7223]
```
        monsters *monster = &menv[tu];
```