fiddlerwoaroof/crawl - Change UWKS5RFSHDUBRVQBBH7NLTZSDV63N4RQU6I6HMYN7JGPZOQ5FGXQC

Fix a few things in previous commit.

Created by Robert Vollmert on October 31, 2009

UWKS5RFSHDUBRVQBBH7NLTZSDV63N4RQU6I6HMYN7JGPZOQ5FGXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 5853 [3.1699344]
B:BD[2.4362] → [2.4362:4408]
```
        const int shield = inv[MSLOT_SHIELD];
```
[2.4362]
[2.4408]
```
        const int shld = inv[MSLOT_SHIELD];
```

Replacement in crawl-ref/source/mon-util.cc at line 5872 [3.1699344]

B:BD[2.5036] → [2.5036:5108]

        if (shield != NON_ITEM && mitm[shield].base_type == OBJ_ARMOUR)

[2.5036]

[2.5108]

        if (shld != NON_ITEM && mitm[shld].base_type == OBJ_ARMOUR)

Replacement in crawl-ref/source/mon-util.cc at line 5875 [3.1699344]

B:BD[2.5154] → [2.5154:5217]

            const int ego = get_armour_ego_type(mitm[shield]);

[2.5154]

[2.5217]

            const int ego = get_armour_ego_type(mitm[shld]);

Replacement in crawl-ref/source/mon-util.cc at line 5906 [3.1699344]
B:BD[2.5783] → [2.5783:5829]
```
        const int shield = inv[MSLOT_SHIELD];
```
[2.5783]
[2.5829]
```
        const int shld = inv[MSLOT_SHIELD];
```

Replacement in crawl-ref/source/mon-util.cc at line 5925 [3.1699344]

B:BD[2.6457] → [2.6457:6529]

        if (shield != NON_ITEM && mitm[shield].base_type == OBJ_ARMOUR)

[2.6457]

[2.6529]

        if (shld != NON_ITEM && mitm[shld].base_type == OBJ_ARMOUR)

Replacement in crawl-ref/source/mon-util.cc at line 5928 [3.1699344]

B:BD[2.6575] → [2.6575:6638]

            const int ego = get_armour_ego_type(mitm[shield]);

[2.6575]

[2.6638]

            const int ego = get_armour_ego_type(mitm[shld]);

Replacement in crawl-ref/source/mon-util.cc at line 5971 [3.1699344]

B:BD[2.7575] → [2.7575:7631]

    const mon_holy_type holiness = mons_holiness(this);

[2.7575]

[2.7631]

    const mon_holy_type holi = mons_holiness(this);

Replacement in crawl-ref/source/mon-util.cc at line 5973 [3.1699344]

B:BD[2.7660] → [2.7660:7729]

        || holiness == MH_NONLIVING
        || holiness == MH_PLANT)

[2.7660]

[2.7729]

        || holi == MH_NONLIVING
        || holi == MH_PLANT)

Replacement in crawl-ref/source/mon-util.cc at line 5989 [3.1699344]

B:BD[2.7944] → [2.7944:8046]

        const int armour = mon->inv[MSLOT_ARMOUR];
        const int shield = mon->inv[MSLOT_SHIELD];

[2.7944]

[2.8046]

        const int armour = this->inv[MSLOT_ARMOUR];
        const int shld = this->inv[MSLOT_SHIELD];

Replacement in crawl-ref/source/mon-util.cc at line 6007 [3.1699344]

B:BD[2.8564] → [2.8564:8636]

        if (shield != NON_ITEM && mitm[shield].base_type == OBJ_ARMOUR)

[2.8564]

[2.8636]

        if (shld != NON_ITEM && mitm[shld].base_type == OBJ_ARMOUR)

Replacement in crawl-ref/source/mon-util.cc at line 6010 [3.1699344]

B:BD[2.8683] → [2.8683:8761]

            if (get_armour_ego_type(mitm[shield]) == SPARM_POISON_RESISTANCE)

[2.8683]

[2.8761]

            if (get_armour_ego_type(mitm[shld]) == SPARM_POISON_RESISTANCE)

Replacement in crawl-ref/source/mon-util.cc at line 6070 [3.1699344]

B:BD[2.9433] → [2.9433:9535]

        const int armour = mon->inv[MSLOT_ARMOUR];
        const int shield = mon->inv[MSLOT_SHIELD];

[2.9433]

[2.9535]

        const int armour = this->inv[MSLOT_ARMOUR];
        const int shld = this->inv[MSLOT_SHIELD];

Replacement in crawl-ref/source/mon-util.cc at line 6080 [3.1699344]

B:BD[2.9769] → [2.9769:9841]

        if (shield != NON_ITEM && mitm[shield].base_type == OBJ_ARMOUR)

[2.9769]

[2.9841]

        if (shld != NON_ITEM && mitm[shld].base_type == OBJ_ARMOUR)

Replacement in crawl-ref/source/mon-util.cc at line 6083 [3.1699344]

B:BD[2.9891] → [2.9891:9967]

            if (get_armour_ego_type(mitm[shield]) == SPARM_POSITIVE_ENERGY)

[2.9891]

[2.9967]

            if (get_armour_ego_type(mitm[shld]) == SPARM_POSITIVE_ENERGY)