fiddlerwoaroof/crawl - Change G7SEHMXQP4UDAMACBLBAQTUBB44WDVUCSFWGI37HTZ7UQ2YT7VXQC

Make monster size checks for weapons and armor consistent with those for

players: torso size, not body size, counts. This should fix [2508934], without having to fix any monster flags :)

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

Created by dolorous on February 6, 2009

G7SEHMXQP4UDAMACBLBAQTUBB44WDVUCSFWGI37HTZ7UQ2YT7VXQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/mon-util.h at line 743 [4.1682293]
B:BD[4.1698875] → [5.9314:9354]
```
size_type mons_size(const monsters *m);
```
Deletion in crawl-ref/source/mon-util.cc at line 2502 [4.1699344]
∅:D[6.11645] → [7.3131:3134]
B:BD[7.3131] → [7.3131:3134]
B:BD[7.3134] → [8.23342:23381]
∅:D[9.7766] → [7.3378:3380]
∅:D[8.23381] → [7.3378:3380]
B:BD[7.3378] → [7.3378:3380]
B:BD[7.3380] → [9.7767:7794]
```
}
size_type mons_size(const monsters *m)
{
    return m->body_size();
```
Replacement in crawl-ref/source/mon-util.cc at line 3921 [4.1699344]
∅:D[2.2755] → [10.15162:15229]
B:BD[10.15162] → [10.15162:15229]
```
    if (!check_weapon_wieldable_size(item, body_size(PSIZE_BODY)))
```
[2.2755]
[10.15229]
```
    if (!check_weapon_wieldable_size(item, body_size()))
```
Replacement in crawl-ref/source/mon-util.cc at line 4337 [4.1699344]
∅:D[11.2697] → [12.3856:3921]
B:BD[12.3856] → [12.3856:3921]
```
        && hands_reqd(item, body_size(PSIZE_BODY)) == HANDS_TWO)
```
[11.2697]
[12.3921]
```
        && hands_reqd(item, body_size()) == HANDS_TWO)
```

Replacement in crawl-ref/source/mon-util.cc at line 4349 [4.1699344]

B:BD[3.3007] → [3.3007:3080]

        if (wpn && hands_reqd(*wpn, body_size(PSIZE_BODY)) == HANDS_TWO)

[3.3007]

[3.3080]

        if (wpn && hands_reqd(*wpn, body_size()) == HANDS_TWO)

Replacement in crawl-ref/source/mon-util.cc at line 4352 [4.1699344]

B:BD[3.3107] → [3.3107:3180]

        if (alt && hands_reqd(*alt, body_size(PSIZE_BODY)) == HANDS_TWO)

[3.3107]

[3.3180]

        if (alt && hands_reqd(*alt, body_size()) == HANDS_TWO)

Replacement in crawl-ref/source/mon-util.cc at line 4652 [4.1699344]

B:BD[13.4056] → [13.4056:4121]

        && hands_reqd(weap, body_size(PSIZE_BODY)) == HANDS_TWO)

[13.4056]

[13.4121]

        && hands_reqd(weap, body_size()) == HANDS_TWO)

Replacement in crawl-ref/source/mon-util.cc at line 4682 [4.1699344]

B:BD[13.4404] → [13.4404:4483]

               && hands_reqd(*mslot_item(MSLOT_WEAPON), body_size(PSIZE_BODY))

[13.4404]

[13.4483]

               && hands_reqd(*mslot_item(MSLOT_WEAPON), body_size())

Replacement in crawl-ref/source/mon-util.cc at line 4689 [4.1699344]
B:BD[8.23989] → [8.23989:24044]
```
    return (check_armour_size(item, mons_size(this)));
```
[8.23989]
[14.814]
```
    return (check_armour_size(item, body_size()));
```

Replacement in crawl-ref/source/makeitem.cc at line 3996 [16.927]

B:BD[15.3013] → [15.3013:3091]

           && hands_reqd(*main_weap, mon->body_size(PSIZE_BODY)) == HANDS_TWO

[15.3013]

[15.3091]

           && hands_reqd(*main_weap, mon->body_size()) == HANDS_TWO

Replacement in crawl-ref/source/makeitem.cc at line 3998 [16.927]

B:BD[15.3111] → [15.3111:3189]

           && hands_reqd(*alt_weap, mon->body_size(PSIZE_BODY)) == HANDS_TWO)

[15.3111]

[15.3189]

           && hands_reqd(*alt_weap, mon->body_size()) == HANDS_TWO)

Replacement in crawl-ref/source/itemprop.cc at line 2739 [17.646661]

B:BD[17.707193] → [17.707193:707264]

        // FIXME
        // size = mons_size( item.plus, PSIZE_BODY );

[17.707193]

[17.707264]

        // FIXME: This should depend on the original monster's size!

Make monster size checks for weapons and armor consistent with those for

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/mon-util.h at line 743 [4.1682293]

Deletion in crawl-ref/source/mon-util.cc at line 2502 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3921 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4337 [4.1699344]