fiddlerwoaroof/crawl - Change L3AZ25JHBR3UGYOWQIYSAIMUSTCCI6LLAWQCL7QRMHVXR4NGV7RAC

Simplify further.

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

Created by dolorous on September 17, 2009

L3AZ25JHBR3UGYOWQIYSAIMUSTCCI6LLAWQCL7QRMHVXR4NGV7RAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tags.cc at line 1882 [9.164589]

B:BD[8.5549] → [8.5549:5622]

    if (m.type == MONS_PLAYER_GHOST || m.type == MONS_PANDEMONIUM_DEMON)

[8.5549]

[8.5622]

    if (mons_is_ghost_demon(m.type))

Replacement in crawl-ref/source/tags.cc at line 2194 [9.164589]

B:BD[8.6941] → [8.6941:7014]

    if (m.type == MONS_PLAYER_GHOST || m.type == MONS_PANDEMONIUM_DEMON)

[8.6941]

[2.465]

    if (mons_is_ghost_demon(m.type))

Insertion in crawl-ref/source/mon-util.h at line 523 [9.1682293]
[10.236]
[6.2988]
```
bool mons_is_ghost_demon(int mc);
```
Replacement in crawl-ref/source/mon-util.cc at line 288 [9.1699344]
∅:D[11.3344] → [12.11848:11927]
B:BD[13.468897] → [12.11848:11927]
```
    if (mon->type == MONS_PLAYER_GHOST || mon->type == MONS_PANDEMONIUM_DEMON)
```
[11.3344]
[11.3345]
```
    if (mons_is_ghost_demon(mon->type))
```

Insertion in crawl-ref/source/mon-util.cc at line 870 [9.1699344]

[9.1705813]

[14.3132]

bool mons_is_ghost_demon(int mc)
{
    return (mc == MONS_PLAYER_GHOST
            || mc == MONS_PANDEMONIUM_DEMON);
}

Replacement in crawl-ref/source/mon-util.cc at line 888 [9.1699344]
B:BD[9.1706162] → [9.1706162:1706241]
```
    if (mon->type == MONS_PLAYER_GHOST || mon->type == MONS_PANDEMONIUM_DEMON)
```
[9.1706162]
[12.12086]
```
    if (mons_is_ghost_demon(mon->type))
```
Replacement in crawl-ref/source/mon-util.cc at line 1151 [9.1699344]
B:BD[15.9918] → [15.9918:9983]
```
    if (mc == MONS_PLAYER_GHOST || mc == MONS_PANDEMONIUM_DEMON)
```
[15.9918]
[16.79]
```
    if (mons_is_ghost_demon(mc))
```

Replacement in crawl-ref/source/mon-util.cc at line 1562 [9.1699344]

B:BD[17.2715] → [7.2960:3039]

    if (mon->type == MONS_PLAYER_GHOST || mon->type == MONS_PANDEMONIUM_DEMON)

[17.2715]

[12.12951]

    if (mons_is_ghost_demon(mon->type))

Replacement in crawl-ref/source/mon-util.cc at line 2585 [9.1699344]

B:BD[18.3051] → [15.11499:11574]

    if (m->type == MONS_PLAYER_GHOST || m->type == MONS_PANDEMONIUM_DEMON)

[18.3051]

[3.2652]

    if (mons_is_ghost_demon(m->type))

Replacement in crawl-ref/source/mon-util.cc at line 3914 [9.1699344]

B:BD[19.2580] → [19.2580:2653]

        if (type == MONS_PLAYER_GHOST || type == MONS_PANDEMONIUM_DEMON)

[19.2580]

[19.2653]

        if (mons_is_ghost_demon(type))

Replacement in crawl-ref/source/describe.cc at line 2589 [9.3736416]

B:BD[20.9129] → [5.3205:3278]

    // Don't leak or duplicate resistance information for demons/ghosts.

[20.9129]

[20.9202]

    // Don't leak or duplicate resistance information for ghost demon
    // monsters.

Replacement in crawl-ref/source/describe.cc at line 2592 [9.3736416]

B:BD[20.9236] → [20.9236:9426]

        (mon.type == MONS_PANDEMONIUM_DEMON
         || mon.type == MONS_PLAYER_GHOST ? get_mons_class_resists(mon.type)
                                          : get_mons_resists(&mon));

[20.9236]

[20.9426]

        mons_is_ghost_demon(mon.type) ? get_mons_class_resists(mon.type)
                                      : get_mons_resists(&mon);

Replacement in crawl-ref/source/describe.cc at line 2679 [9.3736416]

B:BD[21.7952] → [22.6259:6320]

∅:D[22.6320] → [20.9564:9641]

B:BD[21.7985] → [20.9564:9641]

    // These differ from ghost to ghost, so would be spoily.
    if (mon.type != MONS_PANDEMONIUM_DEMON && mon.type != MONS_PLAYER_GHOST)

[21.7952]

[21.8387]

    // These differ between ghost demon monsters, so would be spoily.
    if (!mons_is_ghost_demon(mon.type))

Replacement in crawl-ref/source/debug.cc at line 2718 [9.4016436]
∅:D[4.5527] → [23.100075:100162]
B:BD[9.4050057] → [23.100075:100162]
```
    if (mons.type == MONS_PLAYER_GHOST
        || mons.type == MONS_PANDEMONIUM_DEMON)
```
[4.5527]
[9.4050151]
```
    if (mons_is_ghost_demon(mons.type))
```
Replacement in crawl-ref/source/debug.cc at line 2723 [9.4016436]
B:BD[22.11143] → [22.11143:11185]
```
             ghost.damage, ghost.brand );
```
[22.11143]
[9.4050341]
```
             ghost.damage, ghost.brand);
```

Replacement in crawl-ref/source/command.cc at line 1343 [9.4082507]

B:BD[24.12262] → [22.18500:18562]

B:BD[22.18562] → [6.3521:3635]

∅:D[6.3635] → [22.18674:18796]

B:BD[22.18674] → [22.18674:18796]

        // Don't attempt to get more information on ghosts or
        // pandemonium demons, as the ghost struct has not been
        // initialised, which will cause a crash.
        if (mon_num != MONS_PROGRAM_BUG && mon_num != MONS_PLAYER_GHOST
            && mon_num != MONS_PANDEMONIUM_DEMON)

[24.12262]

[25.2990]

        // Don't attempt to get more information on ghost demon
        // monsters, as the ghost struct has not been initialised, which
        // will cause a crash.
        if (mon_num != MONS_PROGRAM_BUG && !mons_is_ghost_demon(mon_num))