fiddlerwoaroof/crawl - Change UH5I5Z4HRD7QT3J2MCWSAK3VYBSO4WOMU3OCUIIEMN73CURCRK3AC

Add miscellaneous minor fixes.

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

Created by dolorous on March 15, 2009

UH5I5Z4HRD7QT3J2MCWSAK3VYBSO4WOMU3OCUIIEMN73CURCRK3AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 6256 [4.1396662]

[4.1490534]

[5.10517]

    // If the monster's a priest, assume summons come from priestly
    // abilities, in which case they'll have the same god.  If the
    // monster is neither a priest nor a wizard, assume summons come
    // from intrinsic abilities, in which case they'll also have the
    // same god.
    const bool priest = mons_class_flag(monster->type, M_PRIEST);
    const bool wizard = mons_class_flag(monster->type, M_ACTUAL_SPELLS);
    god_type god = (priest || !(priest || wizard)) ? monster->god : GOD_NO_GOD;

Replacement in crawl-ref/source/monstuff.cc at line 6266 [4.1396662]

B:BD[5.10550] → [6.11643:11761]

        && mons_class_flag(monster->type,
                           M_PRIEST | M_ACTUAL_SPELLS | M_SPELL_NO_SILENT))

[5.10550]

[5.10667]

        && (priest || wizard
            || mons_class_flag(monster->type, M_SPELL_NO_SILENT)))

Replacement in crawl-ref/source/monstuff.cc at line 6273 [4.1396662]
B:BD[7.2732] → [2.2469:2625]
∅:D[2.2625] → [4.1490719:1490725]
∅:D[7.2775] → [4.1490719:1490725]
∅:D[8.7283] → [4.1490719:1490725]
∅:D[9.9878] → [4.1490719:1490725]
B:BD[4.1490719] → [4.1490719:1490725]
```
    if (mons_is_shapeshifter(monster)
        && (mons_class_flag(monster->type, M_ACTUAL_SPELLS)
            || mons_class_flag(monster->type, M_PRIEST)))
    {
```
[7.2732]
[7.2776]
```
    if (mons_is_shapeshifter(monster) && (priest || wizard))
```
Deletion in crawl-ref/source/monstuff.cc at line 6275 [4.1396662]
∅:D[7.2800] → [4.1490860:1490866]
B:BD[4.1490860] → [4.1490860:1490866]
```
    }
```

Replacement in crawl-ref/source/monstuff.cc at line 6312 [4.1396662]

B:BD[3.3228] → [3.3228:3300]

                             SPELL_MAJOR_HEALING : SPELL_MINOR_HEALING;

[3.3228]

[4.1492375]

                                 SPELL_MAJOR_HEALING : SPELL_MINOR_HEALING;

Replacement in crawl-ref/source/monstuff.cc at line 6339 [4.1396662]

B:BD[10.4061] → [11.3790:3852]

            for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; i++)

[10.4061]

[10.4297]

            for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; ++i)

Replacement in crawl-ref/source/monstuff.cc at line 6341 [4.1396662]

B:BD[10.4311] → [12.2332:2398]

                if (ms_quick_get_away( monster, hspell_pass[i] ))

[10.4311]

[12.2398]

                if (ms_quick_get_away(monster, hspell_pass[i]))

Replacement in crawl-ref/source/monstuff.cc at line 6371 [4.1396662]

B:BD[11.4119] → [11.4119:4191]

                    if (ms_low_hitpoint_cast( monster, hspell_pass[i] )

[11.4119]

[11.4191]

                    if (ms_low_hitpoint_cast(monster, hspell_pass[i])

Replacement in crawl-ref/source/monstuff.cc at line 6394 [4.1396662]

B:BD[4.1494380] → [11.4408:4470]

            for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; i++)

[4.1494380]

[4.1494420]

            for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; ++i)

Replacement in crawl-ref/source/monstuff.cc at line 6398 [4.1396662]

∅:D[13.8957] → [11.4471:4540]

B:BD[4.1494525] → [11.4471:4540]

                else if (ms_waste_of_time( monster, hspell_pass[i] )

[13.8957]

[11.4619]

                else if (ms_waste_of_time(monster, hspell_pass[i])

Replacement in crawl-ref/source/monstuff.cc at line 6540 [4.1396662]

B:BD[14.13727] → [15.12993:13056]

                             monster->foe, GOD_NO_GOD, false))

[14.13727]

[4.1497942]

                             monster->foe, god, false))