fiddlerwoaroof/crawl - Change IBCGW7GAP7MBB4EQ5Q6B6GAOUIYG3O7NLU2LCK37E7ZSDMTAAYZQC

Use wrapper functions more often when checking monster behaviors.

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

Created by dolorous on June 16, 2008

IBCGW7GAP7MBB4EQ5Q6B6GAOUIYG3O7NLU2LCK37E7ZSDMTAAYZQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2046 [5.1396662]

B:BD[3.2624] → [4.3620:3699]

                && mon->behaviour != BEH_FLEE && mon->behaviour != BEH_PANIC))

[3.2624]

[5.1437741]

                && !mons_is_fleeing(mon) && !mons_is_panicking(mon)))

Replacement in crawl-ref/source/monstuff.cc at line 2077 [5.1396662]

∅:D[4.3958] → [6.6014:6131]

B:BD[5.1438378] → [6.6014:6131]

        if (mon->behaviour != BEH_CORNERED && mon->behaviour != BEH_PANIC
            && mon->behaviour != BEH_FLEE)

[4.3958]

[6.6131]

        if (!mons_is_fleeing(mon) && !mons_is_panicking(mon)
            && !mons_is_cornered(mon))

Replacement in crawl-ref/source/monstuff.cc at line 3531 [5.1396662]
B:BD[5.1465979] → [7.13903:13942]
```
    if (monster->behaviour == BEH_FLEE
```
[5.1465979]
[7.13942]
```
    if (mons_is_fleeing(monster)
```
Replacement in crawl-ref/source/monstuff.cc at line 3588 [5.1396662]
B:BD[8.6449] → [8.6449:6485]
```
    if (mon->behaviour == BEH_FLEE)
```
[8.6449]
[8.6485]
```
    if (mons_is_fleeing(mon))
```
Replacement in crawl-ref/source/monstuff.cc at line 3630 [5.1396662]
B:BD[9.6615] → [9.6615:6659]
```
        if (monster->behaviour == BEH_FLEE)
```
[9.6615]
[9.6659]
```
        if (mons_is_fleeing(monster))
```

Replacement in crawl-ref/source/monstuff.cc at line 4449 [5.1396662]

B:BD[5.1483884] → [10.930:1014]

                if (monster->behaviour == BEH_FLEE || monster->has_ench(ENCH_HELD))

[5.1483884]

[5.1483936]

                if (mons_is_fleeing(monster) || mons_is_caught(monster))

Replacement in crawl-ref/source/monstuff.cc at line 4460 [5.1396662]

B:BD[5.1484193] → [10.1015:1095]

            if (monster->behaviour == BEH_FLEE || monster->has_ench(ENCH_HELD))

[5.1484193]

[5.1484241]

            if (mons_is_fleeing(monster) || mons_is_caught(monster))

Replacement in crawl-ref/source/monstuff.cc at line 4499 [5.1396662]
B:BD[5.1485196] → [5.1485196:1485251]
```
}                               // end handle_scroll()
```
[5.1485196]
[5.1485251]
```
}
```
Deletion in crawl-ref/source/monstuff.cc at line 4997 [5.1396662]
B:BD[5.1492645] → [11.3403:3404]
Replacement in crawl-ref/source/monstuff.cc at line 7093 [5.1396662]
∅:D[2.7281] → [5.1543034:1543082]
B:BD[5.1543034] → [5.1543034:1543082]
```
            if (monster->behaviour == BEH_FLEE)
```
[2.7281]
[5.1543082]
```
            if (mons_is_fleeing(monster))
```
Replacement in crawl-ref/source/monstuff.cc at line 7227 [5.1396662]
∅:D[2.7593] → [5.1546498:1546542]
B:BD[5.1546498] → [5.1546498:1546542]
```
        if (monster->behaviour == BEH_FLEE)
```
[2.7593]
[5.1546542]
```
        if (mons_is_fleeing(monster))
```

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

[12.464478]

bool mons_is_panicking(const monsters *m);
bool mons_is_cornered(const monsters *m);

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

[12.482401]

}
bool mons_is_panicking(const monsters *m)
{
    return (m->behaviour == BEH_PANIC);

Insertion in crawl-ref/source/mon-util.cc at line 2183 [5.1699344]

[5.1733866]

[12.482404]

bool mons_is_cornered(const monsters *m)
{
    return (m->behaviour == BEH_CORNERED);
}

Use wrapper functions more often when checking monster behaviors.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2046 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2077 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3531 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3588 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3630 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4449 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4460 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4499 [5.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 4997 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7093 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7227 [5.1396662]

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

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

Insertion in crawl-ref/source/mon-util.cc at line 2183 [5.1699344]