fiddlerwoaroof/crawl - Change YCOIKIHIKDUTYCNQZASNG6FG2VY2YYZHCA435K7XECLXDZDCSXHQC

is_orckind() and is_dragonkind() no longer duplicate their arguments.

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

Created by haranp on January 13, 2009

YCOIKIHIKDUTYCNQZASNG6FG2VY2YYZHCA435K7XECLXDZDCSXHQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 2204 [5.1340842]
B:BD[3.10243] → [3.10243:10278]
```
    if (is_dragonkind(mons, mons))
```
[3.10243]
[3.10278]
```
    if (is_dragonkind(mons))
```

Replacement in crawl-ref/source/mon-util.cc at line 3908 [5.1699344]

B:BD[4.5641] → [4.5641:5713]

        if (brand == SPWPN_DRAGON_SLAYING && is_dragonkind(this, this))

[4.5641]

[4.5713]

        if (brand == SPWPN_DRAGON_SLAYING && is_dragonkind(this))

Replacement in crawl-ref/source/mon-util.cc at line 3912 [5.1699344]

B:BD[4.5789] → [4.5789:5855]

        if (brand == SPWPN_ORC_SLAYING && is_orckind(this, this))

[4.5789]

[4.5855]

        if (brand == SPWPN_ORC_SLAYING && is_orckind(this))

Replacement in crawl-ref/source/misc.h at line 119 [5.1928926]
B:BD[2.2499] → [2.2499:2555]
```
bool is_orckind(const actor *act, const monsters *mon);
```
[2.2499]
[6.2804]
```
bool is_orckind(const actor *act);
```
Replacement in crawl-ref/source/misc.h at line 121 [5.1928926]
B:BD[6.2805] → [6.2805:2864]
```
bool is_dragonkind(const actor *act, const monsters *mon);
```
[6.2805]
[7.10009]
```
bool is_dragonkind(const actor *act);
```
Replacement in crawl-ref/source/misc.cc at line 3157 [5.1933596]
B:BD[2.2558] → [2.2558:2613]
```
bool is_orckind(const actor *act, const monsters *mon)
```
[2.2558]
[2.2613]
```
bool is_orckind(const actor *act)
```

Replacement in crawl-ref/source/misc.cc at line 3162 [5.1933596]

B:BD[6.2867] → [2.2692:2816]

    if (act->atype() == ACT_MONSTER
        && mons_is_zombified(mon)
        && mons_genus(mon->base_monster) == MONS_ORC)

[6.2867]

[2.2816]

    if (act->atype() == ACT_MONSTER)

Replacement in crawl-ref/source/misc.cc at line 3164 [5.1933596]

B:BD[2.2822] → [2.2822:2845]

        return (true);

[2.2822]

[2.2845]

        const monsters* mon = dynamic_cast<const monsters*>(act);
        if (mons_is_zombified(mon)
            && mons_genus(mon->base_monster) == MONS_ORC)
        {
            return (true);
        }

Replacement in crawl-ref/source/misc.cc at line 3175 [5.1933596]
∅:D[2.2875] → [6.2867:2925]
B:BD[6.2867] → [6.2867:2925]
```
bool is_dragonkind(const actor *act, const monsters *mon)
```
[2.2875]
[6.2925]
```
bool is_dragonkind(const actor *act)
```
Insertion in crawl-ref/source/misc.cc at line 3189 [5.1933596]
[8.2904]
[8.2904]
```
    const monsters* mon = dynamic_cast<const monsters*>(act);
```
Replacement in crawl-ref/source/fight.cc at line 2817 [5.3140790]
B:BD[9.58446] → [2.2953:2992]
```
        if (is_orckind(defender, def))
```
[9.58446]
[10.4015]
```
        if (is_orckind(defender))
```
Replacement in crawl-ref/source/fight.cc at line 2833 [5.3140790]
B:BD[10.4471] → [6.3549:3591]
```
        if (is_dragonkind(defender, def))
```
[10.4471]
[11.8208]
```
        if (is_dragonkind(defender))
```

is_orckind() and is_dragonkind() no longer duplicate their arguments.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 2204 [5.1340842]

Replacement in crawl-ref/source/mon-util.cc at line 3908 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3912 [5.1699344]

Replacement in crawl-ref/source/misc.h at line 119 [5.1928926]

Replacement in crawl-ref/source/misc.h at line 121 [5.1928926]

Replacement in crawl-ref/source/misc.cc at line 3157 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 3162 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 3164 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 3175 [5.1933596]

Insertion in crawl-ref/source/misc.cc at line 3189 [5.1933596]

Replacement in crawl-ref/source/fight.cc at line 2817 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 2833 [5.3140790]