fiddlerwoaroof/crawl - Change YPD42V7VOQFGAVLLOSQAQ4SD77L5L3LZHPLFVZIAOHBNDKPO3O4QC

Make yet more use of wrappers.

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

Created by dolorous on June 16, 2008

YPD42V7VOQFGAVLLOSQAQ4SD77L5L3LZHPLFVZIAOHBNDKPO3O4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1131 [7.16817]

B:BD[7.40202] → [8.2445:2576]

            if (do_updates && (monster->behaviour == BEH_SLEEP
                               || monster->behaviour == BEH_WANDER)

[7.40202]

[9.7312]

            if (do_updates && mons_is_sleeping(monster)
                                || mons_is_wandering(monster))

Replacement in crawl-ref/source/view.cc at line 1243 [7.16817]
∅:D[10.404] → [7.48105:48174]
∅:D[11.11046] → [7.48105:48174]
B:BD[7.48105] → [7.48105:48174]
```
    if (monster->behaviour == BEH_WANDER && monster->foe == MHITYOU)
```
[10.404]
[7.48174]
```
    if (mons_is_wandering(monster) && monster->foe == MHITYOU)
```
Replacement in crawl-ref/source/view.cc at line 1252 [7.16817]
B:BD[7.48265] → [7.48265:48306]
```
    if (monster->behaviour == BEH_SLEEP)
```
[7.48265]
[7.48306]
```
    if (mons_is_sleeping(monster))
```

Replacement in crawl-ref/source/stuff.cc at line 310 [7.224557]

B:BD[12.9254] → [12.9254:9322]

        && (fmenv->behaviour != BEH_SEEK || fmenv->foe != MHITYOU))

[12.9254]

[13.885]

        && (!mons_is_seeking(fmenv) || fmenv->foe != MHITYOU))

Replacement in crawl-ref/source/monstuff.cc at line 2028 [7.1396662]

B:BD[7.1437266] → [7.1437266:1437343]

        if (!isSmart || mon->foe == MHITNOT || mon->behaviour == BEH_WANDER)

[7.1437266]

[7.1437343]

        if (!isSmart || mon->foe == MHITNOT || mons_is_wandering(mon))

Replacement in crawl-ref/source/monstuff.cc at line 2117 [7.1396662]
∅:D[14.4012] → [15.6351:6395]
B:BD[15.6351] → [15.6351:6395]
```
        if (mon->behaviour != BEH_CORNERED)
```
[14.4012]
[7.1438901]
```
        if (!mons_is_cornered(mon))
```
Replacement in crawl-ref/source/monstuff.cc at line 3476 [7.1396662]
B:BD[10.5383] → [10.5383:5424]
```
    if (monster->behaviour == BEH_WANDER
```
[10.5383]
[10.5424]
```
    if (mons_is_wandering(monster)
```

Replacement in crawl-ref/source/monstuff.cc at line 3613 [7.1396662]

B:BD[16.357] → [17.2542:2624]

        && (monster->behaviour != BEH_WANDER || monster->attitude == ATT_NEUTRAL)

[16.357]

[17.2624]

        && (!mons_is_wandering(monster) || monster->attitude == ATT_NEUTRAL)

Replacement in crawl-ref/source/monstuff.cc at line 3676 [7.1396662]
B:BD[7.1468134] → [18.5309:5357]
```
            && monster->behaviour != BEH_WANDER
```
[7.1468134]
[3.2870]
```
            && !mons_is_wandering(monster)
```
Replacement in crawl-ref/source/monstuff.cc at line 3689 [7.1396662]
B:BD[7.1468450] → [18.5405:5453]
```
            && monster->behaviour != BEH_WANDER
```
[7.1468450]
[4.2678]
```
            && !mons_is_wandering(monster)
```

Replacement in crawl-ref/source/monstuff.cc at line 4968 [7.1396662]

B:BD[19.3060] → [19.3060:3111]

                && monster->behaviour == BEH_SEEK)

[19.3060]

[7.1491982]

                && mons_is_seeking(monster))

Replacement in crawl-ref/source/monstuff.cc at line 5592 [7.1396662]
∅:D[20.9455] → [11.430365:430409]
B:BD[11.430365] → [11.430365:430409]
```
        && monster->behaviour == BEH_WANDER
```
[20.9455]
[5.3177]
```
        && mons_is_wandering(monster)
```
Replacement in crawl-ref/source/monstuff.cc at line 5831 [7.1396662]
∅:D[3.12807] → [21.3175:3223]
B:BD[11.434498] → [21.3175:3223]
```
            && monster->behaviour != BEH_WANDER
```
[3.12807]
[21.3223]
```
            && !mons_is_wandering(monster)
```

Insertion in crawl-ref/source/mon-util.h at line 655 [7.1682293]

[6.2998]

[11.464437]

bool mons_is_wandering(const monsters *m);
bool mons_is_seeking(const monsters *m);

Insertion in crawl-ref/source/mon-util.cc at line 2176 [7.1699344]

[6.3128]

[11.482317]

}
bool mons_is_wandering(const monsters *m)
{
    return (m->behaviour == BEH_WANDER);
}
bool mons_is_seeking(const monsters *m)
{
    return (m->behaviour == BEH_SEEK);

Replacement in crawl-ref/source/mon-util.cc at line 3665 [7.1699344]

B:BD[22.2739] → [23.3607:3685]

        && (behaviour == BEH_WANDER || mons_friendly(this) && foe == MHITYOU)

[22.2739]

[22.2774]

        && (mons_is_wandering(this) || mons_friendly(this) && foe == MHITYOU)

Replacement in crawl-ref/source/mon-util.cc at line 3888 [7.1699344]

B:BD[24.2954] → [23.3686:3766]

        if (behaviour != BEH_WANDER && (!mons_friendly(this) || foe != MHITYOU)

[24.2954]

[24.2990]

        if (!mons_is_wandering(this) && (!mons_friendly(this) || foe != MHITYOU)

Replacement in crawl-ref/source/mon-util.cc at line 4059 [7.1699344]
B:BD[22.3429] → [22.3429:3479]
```
        bool wandering = (behaviour == BEH_WANDER
```
[22.3429]
[22.3479]
```
        bool wandering = (mons_is_wandering(this)
```
Replacement in crawl-ref/source/mon-util.cc at line 5272 [7.1699344]
B:BD[25.524] → [2.6179:6216]
```
        if (behaviour == BEH_WANDER)
```
[25.524]
[2.6216]
```
        if (mons_is_wandering(this))
```
Replacement in crawl-ref/source/effects.cc at line 2734 [7.3382105]
B:BD[26.4222] → [26.4222:4264]
```
        if (mon->behaviour != BEH_WANDER)
```
[26.4222]
[26.4264]
```
        if (!mons_is_wandering(mon))
```

Make yet more use of wrappers.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 1131 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1243 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1252 [7.16817]

Replacement in crawl-ref/source/stuff.cc at line 310 [7.224557]

Replacement in crawl-ref/source/monstuff.cc at line 2028 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2117 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3476 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3613 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3676 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3689 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4968 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5592 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5831 [7.1396662]

Insertion in crawl-ref/source/mon-util.h at line 655 [7.1682293]

Insertion in crawl-ref/source/mon-util.cc at line 2176 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3665 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3888 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4059 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5272 [7.1699344]

Replacement in crawl-ref/source/effects.cc at line 2734 [7.3382105]