fiddlerwoaroof/crawl - Change BX6P2BQYNZH2FM4ADLPULHK5FCWEAVXFEUYNHYLCUTSQCOWGNWAQC

Use more wrappers, and add more cleanups.

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

Created by dolorous on June 16, 2008

BX6P2BQYNZH2FM4ADLPULHK5FCWEAVXFEUYNHYLCUTSQCOWGNWAQC

Dependencies

In channels

main

Change contents

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

B:BD[5.1450063] → [6.7157:7217]

                // Try to flee _from_ the correct position.

[5.1450063]

[5.1450122]

                // Special-cased below so that it will flee *from* the
                // correct position.

Replacement in crawl-ref/source/monstuff.cc at line 3690 [5.1396662]
B:BD[7.5453] → [7.5453:5500]
```
            && monster->behaviour != BEH_FLEE)
```
[7.5453]
[5.1468499]
```
            && mons_is_fleeing(monster))
```
Replacement in crawl-ref/source/fight.cc at line 298 [5.3140790]
B:BD[3.3416] → [3.3416:3464]
```
            && !testbits(def->flags, MF_BATTY))
```
[3.3416]
[3.3464]
```
            && !mons_is_batty(def))
```
Replacement in crawl-ref/source/fight.cc at line 311 [5.3140790]
B:BD[8.3284] → [8.3284:3324]
```
        if (def->behaviour == BEH_FLEE)
```
[8.3284]
[8.3324]
```
        if (mons_is_fleeing(def))
```

Replacement in crawl-ref/source/fight.cc at line 319 [5.3140790]

B:BD[8.3523] → [9.7498:7570]

        if (def->has_ench(ENCH_HELD) || def->has_ench(ENCH_PETRIFYING))

[8.3523]

[8.3561]

        if (mons_is_caught(def) || mons_is_petrifying(def))

Replacement in crawl-ref/source/fight.cc at line 327 [5.3140790]
B:BD[8.3733] → [8.3733:3774]
```
        if (def->behaviour == BEH_SLEEP)
```
[8.3733]
[8.3774]
```
        if (mons_is_sleeping(def))
```

Replacement in crawl-ref/source/fight.cc at line 790 [5.3140790]

B:BD[10.950] → [11.2685:2755]

            && def->behaviour == BEH_SLEEP && !player_under_penance()

[10.950]

[2.2643]

            && mons_is_sleeping(def) && !player_under_penance()

Replacement in crawl-ref/source/fight.cc at line 1290 [5.3140790]

∅:D[4.2867] → [12.43830:43918]

B:BD[12.43830] → [12.43830:43918]

    if (def->behaviour != BEH_SLEEP)
        behaviour_event( def, ME_WHACK, MHITYOU );

[4.2867]

[5.3160141]

    if (!mons_is_sleeping(def))
        behaviour_event(def, ME_WHACK, MHITYOU);

Replacement in crawl-ref/source/fight.cc at line 1308 [5.3140790]

B:BD[13.189] → [9.7603:7673]

            || ((mons_cannot_act(def) || def->behaviour == BEH_SLEEP)

[13.189]

[9.7673]

            || ((mons_cannot_act(def) || mons_is_sleeping(def))

Replacement in crawl-ref/source/fight.cc at line 1517 [5.3140790]
∅:D[4.3043] → [12.49131:49179]
B:BD[12.49131] → [12.49131:49179]
```
        if (damage < 1)
            damage = 1;
```
[4.3043]
[14.2662]
```
        damage = std::max(1, damage);
```
Replacement in crawl-ref/source/fight.cc at line 1519 [5.3140790]
∅:D[14.2663] → [12.49188:49229]
B:BD[12.49188] → [12.49188:49229]
```
        if (def->behaviour == BEH_SLEEP)
```
[14.2663]
[12.49229]
```
        if (mons_is_sleeping(def))
```
Replacement in crawl-ref/source/effects.cc at line 2694 [5.3382105]
∅:D[7.6475] → [15.3058:3097]
B:BD[15.3058] → [15.3058:3097]
B:BD[15.3097] → [7.6476:6512]
```
    if (mons_habitat( mon ) != HT_LAND
        || mons_is_zombified( mon )
```
[7.6475]
[7.6512]
```
    if (mons_habitat(mon) != HT_LAND
        || mons_is_zombified(mon)
```
Replacement in crawl-ref/source/effects.cc at line 2697 [5.3382105]
∅:D[7.6577] → [15.3097:3135]
B:BD[15.3097] → [15.3097:3135]
```
        || mons_is_stationary( mon ))
```
[7.6577]
[15.3135]
```
        || mons_is_stationary(mon))
```
Replacement in crawl-ref/source/effects.cc at line 2703 [5.3382105]
∅:D[7.6612] → [15.3197:3260]
B:BD[15.3197] → [15.3197:3260]
```
    if (mon->behaviour == BEH_SLEEP || mons_is_paralysed(mon))
```
[7.6612]
[15.3260]
```
    if (mons_is_sleeping(mon) || mons_is_paralysed(mon))
```

Replacement in crawl-ref/source/effects.cc at line 2728 [5.3382105]

B:BD[16.5204] → [16.5204:5243]

∅:D[16.5243] → [15.4065:4159]

B:BD[15.4065] → [15.4065:4159]

        && (mon->behaviour == BEH_FLEE
            || mon->behaviour == BEH_CORNERED
            || testbits( mon->flags, MF_BATTY )

[16.5204]

[15.4159]

        && (mons_is_fleeing(mon)
            || mons_is_cornered(mon)
            || mons_is_batty(mon)

Replacement in crawl-ref/source/effects.cc at line 2796 [5.3382105]
B:BD[15.6223] → [15.6223:6263]
```
        if (mon->behaviour == BEH_FLEE)
```
[15.6223]
[15.6263]
```
        if (mons_is_fleeing(mon))
```
Replacement in crawl-ref/source/directn.cc at line 2127 [5.3697945]
B:BD[17.2700] → [18.7826:7867]
```
        if (mon->behaviour == BEH_SLEEP)
```
[17.2700]
[18.7867]
```
        if (mons_is_sleeping(mon))
```
Replacement in crawl-ref/source/directn.cc at line 2133 [5.3697945]
B:BD[18.8052] → [18.8052:8097]
```
        else if (mon->behaviour == BEH_FLEE)
```
[18.8052]
[18.8097]
```
        else if (mons_is_fleeing(mon))
```

Replacement in crawl-ref/source/directn.cc at line 2139 [5.3697945]

B:BD[18.8261] → [18.8261:8344]

        else if (!mons_friendly(mon) && !mons_neutral(mon) && mon->foe != MHITYOU)

[18.8261]

[18.8344]

        else if (!mons_friendly(mon) && !mons_neutral(mon)
            && mon->foe != MHITYOU)

Replacement in crawl-ref/source/beam.cc at line 4396 [5.4128068]

∅:D[18.38123] → [19.3186:3264]

B:BD[10.1575] → [19.3186:3264]

                    && mon->behaviour == BEH_SLEEP && !player_under_penance()

[18.38123]

[19.3264]

                    && mons_is_sleeping(mon) && !player_under_penance()

Replacement in crawl-ref/source/beam.cc at line 4581 [5.4128068]

B:BD[10.1953] → [19.3340:3409]

            && mon->behaviour == BEH_SLEEP && YOU_KILL(beam.thrower)

[10.1953]

[19.3409]

            && mons_is_sleeping(mon) && YOU_KILL(beam.thrower)

Use more wrappers, and add more cleanups.

Dependencies

In channels

Change contents

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

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

Replacement in crawl-ref/source/fight.cc at line 298 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 311 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 319 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 327 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 790 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1290 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1308 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1517 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1519 [5.3140790]

Replacement in crawl-ref/source/effects.cc at line 2694 [5.3382105]

Replacement in crawl-ref/source/effects.cc at line 2697 [5.3382105]

Replacement in crawl-ref/source/effects.cc at line 2703 [5.3382105]

Replacement in crawl-ref/source/effects.cc at line 2728 [5.3382105]

Replacement in crawl-ref/source/effects.cc at line 2796 [5.3382105]

Replacement in crawl-ref/source/directn.cc at line 2127 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 2133 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 2139 [5.3697945]

Replacement in crawl-ref/source/beam.cc at line 4396 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 4581 [5.4128068]