fiddlerwoaroof/crawl - Change IXOB6KSQY3CWTXS3LLNDWLVMNK6CV2MCXJAR5CJLNNX4ZOLAMV6QC

Clean up handling of zombie-types.

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

Created by dolorous on March 15, 2008

IXOB6KSQY3CWTXS3LLNDWLVMNK6CV2MCXJAR5CJLNNX4ZOLAMV6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1921 [3.436250]
B:BD[3.498756] → [3.498756:498793]
```
    //     the evil mummy & orc god.
```
[3.498756]
[3.498793]
```
    //     the evil mummy & orc gods.
```
Deletion in crawl-ref/source/spells4.cc at line 1924 [3.436250]
B:BD[3.498827] → [3.498827:498853]
```
    case MONS_NECROPHAGE:
```
Deletion in crawl-ref/source/spells4.cc at line 1925 [3.436250]
B:BD[3.498881] → [3.498881:498945]
```
    case MONS_LICH:
    case MONS_MUMMY:
    case MONS_VAMPIRE:
```

Replacement in crawl-ref/source/spells4.cc at line 1926 [3.436250]

B:BD[3.498973] → [3.498973:499122]

    case MONS_WIGHT:
    case MONS_GHOUL:
    case MONS_BORIS:
    case MONS_ANCIENT_LICH:
    case MONS_VAMPIRE_KNIGHT:
    case MONS_VAMPIRE_MAGE:

[3.498973]

[3.499122]

    case MONS_MUMMY:

Insertion in crawl-ref/source/spells4.cc at line 1930 [3.436250]

[3.499209]

    case MONS_GHOUL:
    case MONS_NECROPHAGE:
    case MONS_VAMPIRE:
    case MONS_VAMPIRE_KNIGHT:
    case MONS_VAMPIRE_MAGE:
    case MONS_LICH:
    case MONS_ANCIENT_LICH:
    case MONS_WIGHT:
    case MONS_BORIS:

Replacement in crawl-ref/source/monstuff.cc at line 1185 [3.1396662]

B:BD[4.259] → [4.259:549]

        // what they are a simulacrum/zombie of, which we currently
        // aren't smart enough to handle.
        || new_mclass == MONS_SIMULACRUM_LARGE
        || new_mclass == MONS_SIMULACRUM_SMALL
        || new_mclass == MONS_ZOMBIE_SMALL
        || new_mclass == MONS_ZOMBIE_LARGE

[4.259]

[4.549]

        // what they are a skeleton/zombie/simulacrum/spectral thing of,
        // which we currently aren't smart enough to handle.
        || mons_class_is_zombified(new_mclass)

Replacement in crawl-ref/source/monstuff.cc at line 1189 [3.1396662]

∅:D[4.550] → [3.1424055:1424136]

B:BD[3.1424055] → [3.1424055:1424136]

        // These shouldn't happen anyways (demons unaffected + holiness check),

[4.550]

[3.1424136]

        // These shouldn't happen anyways (demons unaffected + holiness check),

Replacement in crawl-ref/source/monstuff.cc at line 4424 [3.1396662]

B:BD[3.1509725] → [5.432375:432685]

        if (monster->type == MONS_ZOMBIE_SMALL
            || monster->type == MONS_ZOMBIE_LARGE
            || monster->type == MONS_SIMULACRUM_SMALL
            || monster->type == MONS_SIMULACRUM_LARGE
            || monster->type == MONS_SKELETON_SMALL
            || monster->type == MONS_SKELETON_LARGE)

[3.1509725]

[5.432685]

        if (mons_is_zombified(monster)
            && monster->type != MONS_SPECTRAL_THING)

Replacement in crawl-ref/source/monstuff.cc at line 4431 [3.1396662]

B:BD[5.432818] → [5.432818:432888]

            && (mons_itemuse(monster->type) == MONUSE_WEAPONS_ARMOUR

[5.432818]

[5.432888]

            && (mons_itemuse(monster->type) == MONUSE_WEAPONS_ARMOUR

Replacement in crawl-ref/source/monstuff.cc at line 5643 [3.1396662]

B:BD[3.1537743] → [3.1537743:1538105]

        if (monster->type == MONS_ZOMBIE_SMALL
            || monster->type == MONS_ZOMBIE_LARGE
            || monster->type == MONS_SIMULACRUM_SMALL
            || monster->type == MONS_SIMULACRUM_LARGE
            || monster->type == MONS_SKELETON_SMALL
            || monster->type == MONS_SKELETON_LARGE
            || monster->type == MONS_SPECTRAL_THING)

[3.1537743]

[3.1538105]

        if (mons_is_zombified(monster))

Insertion in crawl-ref/source/monstuff.cc at line 6171 [3.1396662]

[3.1554786]

        if (mons_class_is_zombified(which_class)
            && which_class != MONS_SPECTRAL_THING)
        {
            return (true);
        }

Deletion in crawl-ref/source/monstuff.cc at line 6181 [3.1396662]

B:BD[3.1554886] → [3.1554886:1555090]

        case MONS_SKELETON_LARGE:
        case MONS_SKELETON_SMALL:
        case MONS_ZOMBIE_LARGE:
        case MONS_ZOMBIE_SMALL:
        case MONS_SIMULACRUM_SMALL:
        case MONS_SIMULACRUM_LARGE:

Replacement in crawl-ref/source/monplace.cc at line 772 [3.1641732]

B:BD[3.1654476] → [3.1654476:1654775]

    if (mon_type == MONS_ZOMBIE_SMALL
        || mon_type == MONS_ZOMBIE_LARGE
        || mon_type == MONS_SIMULACRUM_SMALL
        || mon_type == MONS_SIMULACRUM_LARGE
        || mon_type == MONS_SKELETON_SMALL
        || mon_type == MONS_SKELETON_LARGE
        || mon_type == MONS_SPECTRAL_THING)

[3.1654476]

[3.1654775]

    if (mons_class_is_zombified(mon_type))

Insertion in crawl-ref/source/mon-util.h at line 538 [3.1682293]
[2.11522]
[2.11522]
```
bool mons_class_is_zombified(int mc);
```
Deletion in crawl-ref/source/mon-util.cc at line 588 [3.1699344]
B:BD[3.1706536] → [3.1706536:1706537]

Insertion in crawl-ref/source/mon-util.cc at line 643 [3.1699344]

[6.8478]

}
bool mons_class_is_zombified(int mc)
{
    return (mc == MONS_ZOMBIE_SMALL || mc == MONS_ZOMBIE_LARGE
            || mc == MONS_SKELETON_SMALL || mc == MONS_SKELETON_LARGE
            || mc == MONS_SIMULACRUM_SMALL || mc == MONS_SIMULACRUM_LARGE
            || mc == MONS_SPECTRAL_THING);

Replacement in crawl-ref/source/mon-util.cc at line 655 [3.1699344]

B:BD[3.1707704] → [6.8530:8827]

    switch (monster->type)
    {
    case MONS_ZOMBIE_SMALL: case MONS_ZOMBIE_LARGE:
    case MONS_SKELETON_SMALL: case MONS_SKELETON_LARGE:
    case MONS_SIMULACRUM_SMALL: case MONS_SIMULACRUM_LARGE:
    case MONS_SPECTRAL_THING:
        return (true);
    default:
        return (false);
    }

[3.1707704]

[6.8827]

    return mons_class_is_zombified(monster->type);