fiddlerwoaroof/crawl - Change URFOQPK5U6ANCKMHK2R2BYIITZZESHYUNBAEI3WNJCYO7Q66WHNQC

Revert more erroneous cleanups.

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

Created by dolorous on June 19, 2008

URFOQPK5U6ANCKMHK2R2BYIITZZESHYUNBAEI3WNJCYO7Q66WHNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1350 [5.1396662]
B:BD[5.1421288] → [3.2569:2598]
```
        if (!child->alive())
```
[5.1421288]
[5.1421319]
```
        if (child->type == -1)
```
Replacement in crawl-ref/source/monstuff.cc at line 1399 [5.1396662]
B:BD[5.1423135] → [6.2569:2598]
```
        if (monster->alive()
```
[5.1423135]
[6.2598]
```
        if (monster->type != -1
```
Replacement in crawl-ref/source/monstuff.cc at line 1914 [5.1396662]
B:BD[7.4038] → [3.2599:2626]
```
    if (!monster->alive())
```
[7.4038]
[5.1434124]
```
    if (monster->type == -1)
```
Replacement in crawl-ref/source/monstuff.cc at line 2484 [5.1396662]
B:BD[8.13163] → [9.2778:2814]
```
        && !menv[mon->foe].alive())
```
[8.13163]
[5.1440860]
```
        && menv[mon->foe].type == -1)
```
Replacement in crawl-ref/source/monstuff.cc at line 2571 [5.1396662]
B:BD[5.1442374] → [10.3743:3773]
```
    // Validate target again.
```
[5.1442374]
[8.13644]
```
    // Validate current target again.
```
Replacement in crawl-ref/source/monstuff.cc at line 2573 [5.1396662]
B:BD[8.13695] → [2.2569:2605]
```
        && !menv[mon->foe].alive())
```
[8.13695]
[5.1442455]
```
        && menv[mon->foe].type == -1)
```

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

B:BD[5.1471816] → [3.2627:2688]

            if (!targ->alive() || targ->type == NON_MONSTER)

[5.1471816]

[5.1471879]

            if (targ->type == -1 || targ->type == NON_MONSTER)

Replacement in crawl-ref/source/monstuff.cc at line 5706 [5.1396662]
∅:D[11.8956] → [12.139:170]
B:BD[13.430621] → [12.139:170]
```
        if (!monster->alive())
```
[11.8956]
[13.430681]
```
        if (monster->type == -1)
```
Replacement in crawl-ref/source/monstuff.cc at line 5739 [5.1396662]
B:BD[5.1508013] → [3.2721:2756]
```
            if (!monster->alive())
```
[5.1508013]
[14.4669]
```
            if (monster->type == -1)
```
Replacement in crawl-ref/source/monstuff.cc at line 5747 [5.1396662]
B:BD[5.1508327] → [3.2757:2792]
```
            if (!monster->alive())
```
[5.1508327]
[5.1508726]
```
            if (monster->type == -1)
```
Replacement in crawl-ref/source/monstuff.cc at line 6068 [5.1396662]
B:BD[13.437902] → [4.2569:2599]
```
        if (monster->alive())
```
[13.437902]
[15.8442]
```
        if (monster->type != -1)
```

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

B:BD[5.1518329] → [3.2793:2847]

        if (!monster->alive() || immobile_monster[i])

[5.1518329]

[13.439106]

        if (monster->type == -1 || immobile_monster[i])