fiddlerwoaroof/crawl - Change ZUV76RGZDBOY745YXVMGFUOWEH2B47J74BCT5MDKHIDHC4URGMKAC

Add still more cleanups.

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

Created by dolorous on June 16, 2008

ZUV76RGZDBOY745YXVMGFUOWEH2B47J74BCT5MDKHIDHC4URGMKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 2366 [6.1340842]
∅:D[4.2746] → [5.16475:16530]
B:BD[5.16475] → [5.16475:16530]
```
                BEH_HOSTILE, 5, you.pos(), MHITYOU ));
```
[4.2746]
[7.410156]
```
                BEH_HOSTILE, 5, you.pos(), MHITYOU));
```

Replacement in crawl-ref/source/monstuff.cc at line 985 [6.1396662]

∅:D[8.3088] → [5.16570:16710]

B:BD[5.16570] → [5.16570:16710]

B:BD[5.16710] → [2.12752:12855]

∅:D[9.5254] → [10.2927:2997]

∅:D[2.12855] → [10.2927:2997]

B:BD[10.2927] → [10.2927:2997]

                        mgen_data( MONS_SPECTRAL_THING, BEH_FRIENDLY,
                                   0, monster->pos(), you.pet_target,
                                   0, static_cast<god_type>(you.attribute[ATTR_DIVINE_DEATH_CHANNEL]),
                                   spectre, monster->number )) != -1)

[8.3088]

[6.1412564]

                        mgen_data(MONS_SPECTRAL_THING, BEH_FRIENDLY,
                                  0, monster->pos(), you.pet_target,
                                  0, static_cast<god_type>(you.attribute[ATTR_DIVINE_DEATH_CHANNEL]),
                                  spectre, monster->number)) != -1)

Replacement in crawl-ref/source/monstuff.cc at line 2054 [6.1396662]
B:BD[6.1437780] → [6.1437780:1437828]
```
            if (mon->behaviour != BEH_CORNERED)
```
[6.1437780]
[6.1437828]
```
            if (!mons_is_cornered(mon))
```
Replacement in crawl-ref/source/monstuff.cc at line 4983 [6.1396662]
B:BD[6.1492425] → [6.1492425:1492478]
```
            else if (monster->behaviour == BEH_FLEE)
```
[6.1492425]
[6.1492478]
```
            else if (mons_is_fleeing(monster))
```

Replacement in crawl-ref/source/monstuff.cc at line 5027 [6.1396662]

∅:D[11.321] → [6.1493667:1493782]

∅:D[12.3965] → [6.1493667:1493782]

B:BD[6.1493667] → [6.1493667:1493782]

            if (monster->behaviour == BEH_FLEE
                && ms_low_hitpoint_cast( monster, hspell_pass[5] ))

[12.3965]

[6.1493782]

            if (mons_is_fleeing(monster)
                && ms_low_hitpoint_cast(monster, hspell_pass[5]))

Replacement in crawl-ref/source/monstuff.cc at line 5089 [6.1396662]

B:BD[6.1495127] → [6.1495127:1495179]

                if (monster->behaviour == BEH_FLEE)

[6.1495127]

[6.1495179]

                if (mons_is_fleeing(monster))

Replacement in crawl-ref/source/monstuff.cc at line 5593 [6.1396662]
B:BD[7.430409] → [7.430409:430458]
```
        && testbits( monster->flags, MF_BATTY ))
```
[7.430409]
[7.430458]
```
        && mons_is_batty(monster))
```

Replacement in crawl-ref/source/monstuff.cc at line 7073 [6.1396662]

B:BD[6.1542666] → [6.1542666:1542818]

                    dist[i] = (monster->behaviour == BEH_FLEE) ? (-FAR_AWAY)
                                                               : FAR_AWAY;

[6.1542666]

[6.1542818]

                    dist[i] = (mons_is_fleeing(monster)) ? (-FAR_AWAY)
                                                         : FAR_AWAY;

Replacement in crawl-ref/source/monspeak.cc at line 258 [6.1558496]
B:BD[13.10697] → [13.10697:10737]
```
    if (monster->behaviour == BEH_FLEE)
```
[13.10697]
[13.10737]
```
    if (mons_is_fleeing(monster))
```

Replacement in crawl-ref/source/mon-util.cc at line 4088 [6.1699344]

B:BD[14.3835] → [14.3835:3947]

                // Fleeing monster only pick up emergency equipment.
                if (behaviour == BEH_FLEE)

[14.3835]

[15.9121]

                // Fleeing monsters only pick up emergency equipment.
                if (mons_is_fleeing(this))

Replacement in crawl-ref/source/mon-util.cc at line 5535 [6.1699344]
∅:D[3.6623] → [16.5453:5498]
B:BD[16.5453] → [16.5453:5498]
```
            || this->behaviour == BEH_SLEEP)
```
[3.6623]
[16.5498]
```
            || mons_is_sleeping(this))
```

Replacement in crawl-ref/source/item_use.cc at line 4322 [6.2781507]

B:BD[5.44350] → [5.44350:44481]

                mgen_data( MONS_ABOMINATION_SMALL, BEH_FRIENDLY, 6,
                           you.pos(), you.pet_target )) != -1)

[5.44350]

[6.2861804]

                mgen_data(MONS_ABOMINATION_SMALL, BEH_FRIENDLY,
                          6, you.pos(), you.pet_target)) != -1)

Add still more cleanups.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 2366 [6.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 985 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2054 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4983 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5027 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5089 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5593 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7073 [6.1396662]

Replacement in crawl-ref/source/monspeak.cc at line 258 [6.1558496]

Replacement in crawl-ref/source/mon-util.cc at line 4088 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5535 [6.1699344]

Replacement in crawl-ref/source/item_use.cc at line 4322 [6.2781507]