fiddlerwoaroof/crawl - Change 5I3RE6QCG6W3HD54OBDOZ7IDGHKEL7XBIOU5XVWTUDQQTDZV22NQC

Combine mons_is_sleeping(monsters *m) into monsters::asleep()

…and replace all references to mons_is_sleeping with asleep.

Created by abrahamwl on October 30, 2009

5I3RE6QCG6W3HD54OBDOZ7IDGHKEL7XBIOU5XVWTUDQQTDZV22NQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 945 [9.16817]

B:BD[8.45] → [4.6:71]

        && you.visible_to(monster) && !mons_is_sleeping(monster)

[8.45]

[10.8]

        && you.visible_to(monster) && !monster->asleep()

Replacement in crawl-ref/source/view.cc at line 985 [9.16817]

B:BD[11.393] → [4.72:137]

        && you.visible_to(monster) && !mons_is_sleeping(monster)

[11.393]

[10.155]

        && you.visible_to(monster) && !monster->asleep()

Replacement in crawl-ref/source/view.cc at line 1020 [9.16817]

B:BD[12.408] → [4.138:203]

        && you.visible_to(monster) && !mons_is_sleeping(monster)

[12.408]

[12.478]

        && you.visible_to(monster) && !monster->asleep()

Replacement in crawl-ref/source/view.cc at line 1395 [9.16817]
∅:D[13.355] → [14.7:64]
B:BD[9.40202] → [14.7:64]
```
            if (do_updates && (mons_is_sleeping(monster)
```
[9.40202]
[15.7]
```
            if (do_updates && (monster->asleep()
```
Replacement in crawl-ref/source/view.cc at line 1518 [9.16817]
B:BD[9.48265] → [16.191:226]
```
    if (mons_is_sleeping(monster))
```
[9.48265]
[9.48306]
```
    if (monster->asleep())
```
Replacement in crawl-ref/source/view.cc at line 1903 [9.16817]
∅:D[17.242] → [18.2205:2247]
B:BD[18.2205] → [18.2205:2247]
```
            if (mons_is_sleeping(monster)
```
[17.242]
[19.30]
```
            if (monster->asleep()
```
Replacement in crawl-ref/source/util/crawl.rc at line 1 [20.128]
B:BD[20.128] → [20.129:174]
```
IDI_ICON1 ICON DISCARDABLE "util/crawl.ico"
```
[20.128]
```
IDI_ICON1 ICON DISCARDABLE "util/crawl.ico"
```
Replacement in crawl-ref/source/spells1.cc at line 687 [9.616635]
∅:D[21.258] → [22.873:938]
B:BD[22.873] → [22.873:938]
```
    if (mons_is_sleeping(mon)) // not aware of what is happening
```
[21.258]
[23.10904]
```
    if (mon->asleep()) // not aware of what is happening
```
Replacement in crawl-ref/source/religion.cc at line 5669 [9.804403]
∅:D[4.3089] → [24.39817:39867]
∅:D[25.3116] → [24.39817:39867]
B:BD[24.39817] → [24.39817:39867]
```
                    && !mons_is_sleeping(monster)
```
[4.3089]
[24.39867]
```
                    && !monster->asleep()
```
Replacement in crawl-ref/source/monstuff.cc at line 2094 [9.1396662]
B:BD[26.2632] → [26.2632:2675]
```
            && !mons_is_sleeping(monster))
```
[26.2632]
[9.1423250]
```
            && !monster->asleep())
```
Replacement in crawl-ref/source/monstuff.cc at line 2982 [9.1396662]
B:BD[27.2867] → [28.2879:2930]
```
    bool was_sleeping     = mons_is_sleeping(mon);
```
[27.2867]
[9.1436674]
```
    bool was_sleeping     = mon->asleep();
```
Replacement in crawl-ref/source/monstuff.cc at line 3001 [9.1396662]
B:BD[29.5141] → [26.2768:2803]
```
        if (mons_is_sleeping(mon))
```
[29.5141]
[30.3027]
```
        if (mon->asleep())
```

Replacement in crawl-ref/source/monstuff.cc at line 3052 [9.1396662]

B:BD[30.3131] → [30.3131:3188]

            if (mons_is_sleeping(mon) && mons_near(mon))

[30.3131]

[30.3188]

            if (mon->asleep() && mons_near(mon))

Replacement in crawl-ref/source/monstuff.cc at line 3075 [9.1396662]
B:BD[2.2957] → [2.2957:2996]
```
            && !mons_is_sleeping(mon))
```
[2.2957]
[2.2996]
```
            && !mon->asleep())
```
Replacement in crawl-ref/source/monstuff.cc at line 3080 [9.1396662]
B:BD[30.3238] → [30.3238:3291]
```
        if (mons_is_sleeping(mon) && mons_near(mon))
```
[31.2790]
[30.3291]
```
        if (mon->asleep() && mons_near(mon))
```

Replacement in crawl-ref/source/monstuff.cc at line 3209 [9.1396662]

B:BD[32.3463] → [32.3463:3525]

    if (was_sleeping && !mons_is_sleeping(mon) && allow_shout

[32.3463]

[32.3525]

    if (was_sleeping && !mon->asleep() && allow_shout

Replacement in crawl-ref/source/monstuff.cc at line 5654 [9.1396662]
∅:D[33.2756] → [26.2832:2869]
B:BD[26.2832] → [26.2832:2869]
```
        || mons_is_sleeping(monster)
```
[33.2756]
[34.3383]
```
        || monster->asleep()
```

Replacement in crawl-ref/source/monstuff.cc at line 5805 [9.1396662]

B:BD[35.7995] → [35.7995:8041]

                    && !mons_is_sleeping(mon)

[35.7995]

[35.8041]

                    && !mon->asleep()

Replacement in crawl-ref/source/monstuff.cc at line 5866 [9.1396662]
B:BD[7.6141] → [7.6141:6179]
```
         || mons_is_sleeping(monster)
```
[7.6141]
[7.6179]
```
         || monster->asleep()
```
Replacement in crawl-ref/source/monstuff.cc at line 6402 [9.1396662]
B:BD[36.6497] → [26.3038:3072]
```
    if (mons_is_sleeping(monster)
```
[9.1479204]
[26.3072]
```
    if (monster->asleep()
```
Replacement in crawl-ref/source/monstuff.cc at line 6504 [9.1396662]
B:BD[36.6618] → [26.6458:6492]
```
    if (mons_is_sleeping(monster)
```
[36.6618]
[34.3500]
```
    if (monster->asleep()
```
Replacement in crawl-ref/source/monstuff.cc at line 6603 [9.1396662]
B:BD[26.8270] → [26.8270:8307]
```
        || mons_is_sleeping(monster)
```
[26.8270]
[26.8307]
```
        || monster->asleep()
```
Replacement in crawl-ref/source/monstuff.cc at line 6846 [9.1396662]
B:BD[36.7014] → [26.12638:12672]
```
    if (mons_is_sleeping(monster)
```
[36.7014]
[34.3576]
```
    if (monster->asleep()
```
Replacement in crawl-ref/source/monstuff.cc at line 7853 [9.1396662]
∅:D[37.5472] → [38.2718:2788]
B:BD[39.3224] → [38.2718:2788]
```
        if (!mons_is_sleeping(monster) && !mons_is_wandering(monster)
```
[37.5472]
[40.9217]
```
        if (!monster->asleep() && !mons_is_wandering(monster)
```
Replacement in crawl-ref/source/monstuff.cc at line 8341 [9.1396662]
∅:D[3.2849] → [41.8903:8968]
B:BD[41.8903] → [41.8903:8968]
```
    if (mons_is_sleeping(monster) || mons_is_submerged(monster))
```
[41.8903]
[41.8968]
```
    if (monster->asleep() || mons_is_submerged(monster))
```
Replacement in crawl-ref/source/monstuff.cc at line 8429 [9.1396662]
B:BD[42.4826] → [42.4826:4864]
```
        || mons_is_sleeping(mpusher))
```
[42.4826]
[43.333]
```
        || mpusher->asleep())
```
Replacement in crawl-ref/source/monstuff.cc at line 8461 [9.1396662]
B:BD[44.442062] → [44.442062:442092]
```
    if (mons_is_sleeping(m2))
```
[44.442062]
[44.442092]
```
    if (m2->asleep())
```
Replacement in crawl-ref/source/monstuff.cc at line 9537 [9.1396662]
B:BD[45.245395] → [26.12961:13020]
```
    if ((wake || hurted > 0) && mons_is_sleeping(monster))
```
[45.245395]
[45.245460]
```
    if ((wake || hurted > 0) && monster->asleep())
```
Deletion in crawl-ref/source/mon-util.h at line 788 [9.1682293]
B:BD[46.12393] → [47.2956:2998]
```
bool mons_is_sleeping(const monsters *m);
```
Deletion in crawl-ref/source/mon-util.cc at line 2753 [9.1699344]
B:BD[47.3045] → [47.3045:3128]
B:BD[47.3128] → [16.3384:3387]
```
bool mons_is_sleeping(const monsters *m)
{
    return (m->behaviour == BEH_SLEEP);
}
```
Replacement in crawl-ref/source/mon-util.cc at line 5986 [9.1699344]
B:BD[48.13198] → [48.13198:13235]
```
    return (mons_is_sleeping(this));
```
[48.13198]
[48.13235]
```
    return (behaviour == BEH_SLEEP);
```
Replacement in crawl-ref/source/mon-util.cc at line 7413 [9.1699344]
B:BD[42.6623] → [49.3509:3548]
```
            || mons_is_sleeping(this))
```
[42.6623]
[50.5498]
```
            || asleep())
```
Replacement in crawl-ref/source/mon-info.cc at line 166 [6.4325]
B:BD[6.8635] → [6.8635:8668]
```
        if (mons_is_sleeping(m))
```
[6.8635]
[6.8668]
```
        if (m->asleep())
```
Replacement in crawl-ref/source/misc.cc at line 2699 [9.1933596]
B:BD[51.4610] → [51.4610:4641]
```
    if (mons_is_sleeping(mon))
```
[51.4610]
[51.4641]
```
    if (mon->asleep())
```
Replacement in crawl-ref/source/exclude.cc at line 32 [5.3225]
B:BD[5.3878] → [5.3878:3914]
```
    return (mons_is_sleeping(mon));
```
[5.3878]
[5.3914]
```
    return (mon->asleep());
```
Replacement in crawl-ref/source/effects.cc at line 4004 [9.3382105]
B:BD[29.6612] → [52.3382:3439]
```
    if (mons_is_sleeping(mon) || mons_is_paralysed(mon))
```
[29.6612]
[53.3260]
```
    if (mon->asleep() || mons_is_paralysed(mon))
```
Replacement in crawl-ref/source/directn.cc at line 3121 [9.3697945]
B:BD[54.2700] → [52.3584:3619]
```
        if (mons_is_sleeping(mon))
```
[54.2700]
[55.7867]
```
        if (mon->asleep())
```
Replacement in crawl-ref/source/directn.cc at line 3158 [9.3697945]
∅:D[56.10317] → [57.3084:3150]
B:BD[57.3084] → [57.3084:3150]
```
    if (mons_behaviour_perceptible(mon) && !mons_is_sleeping(mon)
```
[56.10317]
[57.3150]
```
    if (mons_behaviour_perceptible(mon) && !mon->asleep()
```
Replacement in crawl-ref/source/delay.cc at line 75 [9.3963459]
∅:D[58.2826] → [59.3214:3251]
B:BD[59.3214] → [59.3214:3251]
```
            || mons_is_sleeping(mon)
```
[58.2826]
[8.2795]
```
            || mon->asleep()
```
Replacement in crawl-ref/source/debug.cc at line 2645 [9.4016436]
B:BD[60.3813] → [24.99092:99145]
```
         (mons_is_sleeping(&mons)        ? "sleep" :
```
[60.3813]
[24.99145]
```
         (mons.asleep()        ? "sleep" :
```

Replacement in crawl-ref/source/beam.cc at line 4371 [9.4128068]

B:BD[61.50373] → [61.50373:50441]

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

[61.50373]

[61.50441]

                && mon->asleep() && !player_under_penance()

Replacement in crawl-ref/source/beam.cc at line 4655 [9.4128068]

B:BD[62.1953] → [61.57614:57672]

            && mons_is_sleeping(mon) && YOU_KILL(thrower)

[62.1953]

[63.3409]

            && mon->asleep() && YOU_KILL(thrower)

Combine mons_is_sleeping(monsters *m) into monsters::asleep()

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 945 [9.16817]

Replacement in crawl-ref/source/view.cc at line 985 [9.16817]

Replacement in crawl-ref/source/view.cc at line 1020 [9.16817]

Replacement in crawl-ref/source/view.cc at line 1395 [9.16817]

Replacement in crawl-ref/source/view.cc at line 1518 [9.16817]

Replacement in crawl-ref/source/view.cc at line 1903 [9.16817]

Replacement in crawl-ref/source/util/crawl.rc at line 1 [20.128]

Replacement in crawl-ref/source/spells1.cc at line 687 [9.616635]

Replacement in crawl-ref/source/religion.cc at line 5669 [9.804403]

Replacement in crawl-ref/source/monstuff.cc at line 2094 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2982 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3001 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3052 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3075 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3080 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3209 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5654 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5805 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5866 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6402 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6504 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6603 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6846 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7853 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8341 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8429 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8461 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 9537 [9.1396662]

Deletion in crawl-ref/source/mon-util.h at line 788 [9.1682293]

Deletion in crawl-ref/source/mon-util.cc at line 2753 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5986 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7413 [9.1699344]

Replacement in crawl-ref/source/mon-info.cc at line 166 [6.4325]

Replacement in crawl-ref/source/misc.cc at line 2699 [9.1933596]

Replacement in crawl-ref/source/exclude.cc at line 32 [5.3225]

Replacement in crawl-ref/source/effects.cc at line 4004 [9.3382105]

Replacement in crawl-ref/source/directn.cc at line 3121 [9.3697945]

Replacement in crawl-ref/source/directn.cc at line 3158 [9.3697945]

Replacement in crawl-ref/source/delay.cc at line 75 [9.3963459]

Replacement in crawl-ref/source/debug.cc at line 2645 [9.4016436]

Replacement in crawl-ref/source/beam.cc at line 4371 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 4655 [9.4128068]