fiddlerwoaroof/crawl - Change MHI3OM6VJY6LZUD577O22XREHPOPMWDVR3UT2JWGFDAKD7SO6Y3QC

Add still more miscellaneous minor fixes.

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

Created by dolorous on October 5, 2008

MHI3OM6VJY6LZUD577O22XREHPOPMWDVR3UT2JWGFDAKD7SO6Y3QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monplace.cc at line 92 [8.1641732]

B:BD[6.9364] → [7.5353:5470]

    const int type = mons_is_zombified(m) ? mons_zombie_base(m)
                                          : m->type;

[6.9364]

[9.15192]

    const int montype = mons_is_zombified(m) ? mons_zombie_base(m)
                                             : m->type;

Replacement in crawl-ref/source/monplace.cc at line 95 [8.1641732]
∅:D[10.2933] → [6.9438:9507]
∅:D[9.15193] → [6.9438:9507]
B:BD[6.9438] → [6.9438:9507]
```
    return (monster_habitable_grid(type, actual_grid, mons_flies(m),
```
[9.15193]
[5.2403]
```
    return (monster_habitable_grid(montype, actual_grid, mons_flies(m),
```

Replacement in crawl-ref/source/monplace.cc at line 553 [8.1641732]

B:BD[3.2702] → [3.2702:2838]

    const int htype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                       : mg.cls);

[3.2702]

[3.2838]

    const int montype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                         : mg.cls);

Replacement in crawl-ref/source/monplace.cc at line 556 [8.1641732]

B:BD[3.2877] → [3.2877:2928]

        habitat2grid(mons_habitat_by_type(htype));

[3.2877]

[3.2928]

        habitat2grid(mons_habitat_by_type(montype));

Replacement in crawl-ref/source/monplace.cc at line 827 [8.1641732]

B:BD[11.4122] → [12.4149:4285]

    const int htype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                       : mg.cls);

[11.4122]

[12.4285]

    const int montype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                         : mg.cls);

Replacement in crawl-ref/source/monplace.cc at line 835 [8.1641732]

B:BD[4.2640] → [4.2640:2710]

        && (force_pos || monster_habitable_grid(htype, grd(mg.pos))))

[4.2640]

[8.1652958]

        && (force_pos || monster_habitable_grid(montype, grd(mg.pos))))

Insertion in crawl-ref/source/monplace.cc at line 2126 [8.1641732]

[13.459830]

    const int montype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                         : mg.cls);

Deletion in crawl-ref/source/monplace.cc at line 2130 [8.1641732]

B:BD[13.459850] → [14.7573:7695]

    int type = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                : mg.cls);

Replacement in crawl-ref/source/monplace.cc at line 2135 [8.1641732]

B:BD[14.7822] → [14.7822:7874]

        || !mons_class_can_pass(type, grd(mg.pos)))

[14.7822]

[11.5410]

        || !mons_class_can_pass(montype, grd(mg.pos)))

Replacement in crawl-ref/source/monplace.cc at line 2137 [8.1641732]

B:BD[11.5416] → [14.7875:7927]

        mg.pos = find_newmons_square(type, mg.pos);

[11.5416]

[11.5417]

        mg.pos = find_newmons_square(montype, mg.pos);

Replacement in crawl-ref/source/dungeon.cc at line 4654 [8.3429798]

B:BD[15.24204] → [14.11286:11425]

            const int type = mons_class_is_zombified(mid) ? mspec.monbase
                                                          : mid;

[15.24204]

[14.11425]

            const int montype = mons_class_is_zombified(mid) ? mspec.monbase
                                                             : mid;
            const habitat_type habitat = mons_habitat_by_type(montype);

Deletion in crawl-ref/source/dungeon.cc at line 4659 [8.3429798]
B:BD[14.11426] → [14.11426:11495]
```
            const habitat_type habitat = mons_habitat_by_type(type);
```

Replacement in crawl-ref/source/dungeon.cc at line 4660 [8.3429798]

B:BD[2.2705] → [2.2705:2778]

                && (habitat != HT_WATER || !mons_class_amphibious(mid)))

[2.2705]

[2.2778]

                && (habitat != HT_WATER || !mons_class_amphibious(montype)))