fiddlerwoaroof/crawl - Change TGMLNXYRQPKRNQLMRQYRF2SPMB7SREC5N3H5QXT3UYSSY7UCTLCAC

Add miscellaneous minor cleanups.

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

Created by dolorous on January 24, 2009

TGMLNXYRQPKRNQLMRQYRF2SPMB7SREC5N3H5QXT3UYSSY7UCTLCAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 7689 [8.1396662]

B:BD[6.4124] → [7.4628:4690]

void mons_check_pool(monsters *mons, const coord_def &oldpos,

[6.4124]

[7.4690]

void mons_check_pool(monsters *monster, const coord_def &oldpos,

Replacement in crawl-ref/source/monstuff.cc at line 7693 [8.1396662]
B:BD[6.4246] → [9.10342:10368]
```
    if (mons->airborne())
```
[6.4246]
[6.4334]
```
    if (monster->airborne())
```
Replacement in crawl-ref/source/monstuff.cc at line 7696 [8.1396662]
∅:D[10.9807] → [11.360:410]
B:BD[6.4355] → [11.360:410]
```
    dungeon_feature_type grid = grd(mons->pos());
```
[10.9807]
[12.133]
```
    dungeon_feature_type grid = grd(monster->pos());
```
Replacement in crawl-ref/source/monstuff.cc at line 7698 [8.1396662]
B:BD[12.188] → [13.2156:2204]
```
        && !monster_habitable_grid(mons, grid))
```
[12.188]
[6.4444]
```
        && !monster_habitable_grid(monster, grid))
```
Replacement in crawl-ref/source/monstuff.cc at line 7700 [8.1396662]
B:BD[6.4450] → [6.4450:4496]
```
        const bool message = mons_near(mons);
```
[6.4450]
[10.9808]
```
        const bool message = mons_near(monster);
```

Replacement in crawl-ref/source/monstuff.cc at line 7704 [8.1396662]

∅:D[14.2754] → [7.4745:4816]

B:BD[15.10540] → [7.4745:4816]

        if (message && (oldpos == mons->pos() || grd(oldpos) != grid))

[14.2754]

[15.10541]

        if (message && (oldpos == monster->pos() || grd(oldpos) != grid))

Replacement in crawl-ref/source/monstuff.cc at line 7706 [8.1396662]

∅:D[15.10551] → [6.4645:4687]

B:BD[6.4645] → [6.4645:4687]

B:BD[6.4687] → [16.1928:1979]

B:BD[16.1979] → [4.2637:2693]

            mprf("%s falls into the %s!",
                 mons->name(DESC_CAP_THE).c_str(),
                 grid == DNGN_LAVA ? "lava" : "water");

[15.10551]

[15.10552]

            simple_monster_message(monster,
                make_stringf(" falls into the %s!",
                             grid == DNGN_LAVA ? "lava" : "water").c_str());

Replacement in crawl-ref/source/monstuff.cc at line 7711 [8.1396662]

B:BD[6.4794] → [17.7171:7230]

        if (grid == DNGN_LAVA && mons_res_fire(mons) >= 2)

[6.4794]

[18.272]

        if (grid == DNGN_LAVA && mons_res_fire(monster) >= 2)

Replacement in crawl-ref/source/monstuff.cc at line 7716 [8.1396662]
∅:D[5.4200] → [18.310:362]
∅:D[19.7161] → [18.310:362]
B:BD[20.175] → [18.310:362]
```
        if (grid == DNGN_LAVA || mons->can_drown())
```
[5.4200]
[6.4899]
```
        if (grid == DNGN_LAVA || monster->can_drown())
```

Replacement in crawl-ref/source/monstuff.cc at line 7722 [8.1396662]

B:BD[21.3408] → [3.2677:2746]

                    simple_monster_message(mons, " is incinerated.",

[21.3408]

[3.2746]

                    simple_monster_message(monster, " is incinerated.",

Replacement in crawl-ref/source/monstuff.cc at line 7725 [8.1396662]

∅:D[21.3574] → [22.472:535]

B:BD[22.472] → [22.472:535]

                else if (mons_genus(mons->type) == MONS_MUMMY)

[21.3574]

[21.3575]

                else if (mons_genus(monster->type) == MONS_MUMMY)

Replacement in crawl-ref/source/monstuff.cc at line 7727 [8.1396662]

B:BD[21.3593] → [3.2824:2890]

                    simple_monster_message(mons, " falls apart.",

[21.3593]

[3.2890]

                    simple_monster_message(monster, " falls apart.",

Replacement in crawl-ref/source/monstuff.cc at line 7732 [8.1396662]

B:BD[21.3775] → [3.2968:3029]

                    simple_monster_message(mons, " drowns.",

[21.3775]

[3.3029]

                    simple_monster_message(monster, " drowns.",

Replacement in crawl-ref/source/monstuff.cc at line 7741 [8.1396662]

B:BD[23.2481] → [23.2481:2528]

                killnum = monster_index(mons);

[23.2481]

[23.2528]

                killnum = monster_index(monster);

Replacement in crawl-ref/source/monstuff.cc at line 7744 [8.1396662]
∅:D[2.2608] → [23.2542:2596]
B:BD[23.2542] → [23.2542:2596]
```
            monster_die(mons, killer, killnum, true);
```
[2.2608]
[6.5215]
```
            monster_die(monster, killer, killnum, true);
```

Add miscellaneous minor cleanups.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 7689 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7693 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7696 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7698 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7700 [8.1396662]