fiddlerwoaroof/crawl - Change W6JMQP26KNVIZOJTITBWR447OX63DUKBIQE442Q7QYLUUKJVBELAC

Add yet more cleanups.

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

Created by dolorous on June 16, 2008

W6JMQP26KNVIZOJTITBWR447OX63DUKBIQE442Q7QYLUUKJVBELAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 1003 [4.1340842]

B:BD[2.5167] → [2.5167:5222]

                    && monster->behaviour != BEH_LURK;

[2.5167]

[5.400334]

                    && !mons_is_lurking(monster);

Replacement in crawl-ref/source/monstuff.cc at line 2150 [4.1396662]

B:BD[6.2748] → [6.2748:2813]

    if (old_behaviour == BEH_LURK && mon->behaviour != BEH_LURK)

[6.2748]

[6.2813]

    if (old_behaviour == BEH_LURK && !mons_is_lurking(mon))

Replacement in crawl-ref/source/monstuff.cc at line 3643 [4.1396662]

B:BD[7.5274] → [6.3266:3329]

        && monster->behaviour != BEH_LURK // Handled elsewhere

[7.5274]

[8.2652]

        && !mons_is_lurking(monster)  // Handled elsewhere.

Replacement in crawl-ref/source/monstuff.cc at line 3645 [4.1396662]

B:BD[8.2681] → [9.7707:7818]

            || grid_distance( monster->x, monster->y,
                              you.x_pos, you.y_pos ) > 1

[8.2681]

[9.7818]

            || grid_distance(monster->x, monster->y,
                             you.x_pos, you.y_pos) > 1

Replacement in crawl-ref/source/monstuff.cc at line 5712 [4.1396662]
B:BD[6.3373] → [6.3373:3417]
```
        if (monster->behaviour == BEH_LURK)
```
[6.3373]
[6.3417]
```
        if (mons_is_lurking(monster))
```

Replacement in crawl-ref/source/monstuff.cc at line 5715 [4.1396662]

B:BD[6.3502] → [6.3502:3562]

            // next tp them, otherwise they just sit there.

[6.3502]

[6.3562]

            // next to them, otherwise they just sit there.

Insertion in crawl-ref/source/mon-util.h at line 654 [4.1682293]
[10.12393]
[5.464437]
```
bool mons_is_sleeping(const monsters *m);
```
Replacement in crawl-ref/source/mon-util.h at line 658 [4.1682293]
∅:D[3.3164] → [5.464478:464520]
B:BD[5.464478] → [5.464478:464520]
```
bool mons_is_sleeping(const monsters *m);
```
[3.3164]
[5.464520]
```
bool mons_is_lurking(const monsters *m);
```

Insertion in crawl-ref/source/mon-util.cc at line 2171 [4.1699344]

[11.1240]

[5.482317]

}
bool mons_is_sleeping(const monsters *m)
{
    return (m->behaviour == BEH_SLEEP);

Replacement in crawl-ref/source/mon-util.cc at line 2193 [4.1699344]
∅:D[3.3343] → [5.482404:482445]
B:BD[4.1733866] → [5.482404:482445]
```
bool mons_is_sleeping(const monsters *m)
```
[3.3343]
[4.1733909]
```
bool mons_is_lurking(const monsters *m)
```
Replacement in crawl-ref/source/mon-util.cc at line 2195 [4.1699344]
B:BD[4.1733911] → [5.482446:482486]
```
    return (m->behaviour == BEH_SLEEP);
```
[4.1733911]
[5.482486]
```
    return (m->behaviour == BEH_LURK);
```
Replacement in crawl-ref/source/mon-util.cc at line 4940 [4.1699344]
B:BD[6.5499] → [6.5499:5534]
```
        if (behaviour == BEH_LURK)
```
[6.5499]
[6.5534]
```
        if (mons_is_lurking(this))
```
Replacement in crawl-ref/source/mon-util.cc at line 4984 [4.1699344]
B:BD[6.6286] → [6.6286:6321]
```
        if (behaviour == BEH_LURK)
```
[6.6286]
[12.6476]
```
        if (mons_is_lurking(this))
```
Replacement in crawl-ref/source/mon-util.cc at line 5699 [4.1699344]
B:BD[6.6982] → [6.6982:7021]
```
            if (behaviour != BEH_LURK)
```
[6.6982]
[6.7021]
```
            if (!mons_is_lurking(this))
```

Add yet more cleanups.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 1003 [4.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 2150 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3643 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3645 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5712 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5715 [4.1396662]

Insertion in crawl-ref/source/mon-util.h at line 654 [4.1682293]

Replacement in crawl-ref/source/mon-util.h at line 658 [4.1682293]

Insertion in crawl-ref/source/mon-util.cc at line 2171 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2193 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2195 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4940 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4984 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5699 [4.1699344]