fiddlerwoaroof/crawl - Change K4ZO7CVDWUJRLGMBQDDLHOVT45DWZQWINRQGWPWP4DLYKVD3672AC

Properly allow small races to use staves again (oops), and handle all

staff-type weapons consistently.

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

Created by dolorous on November 6, 2008

K4ZO7CVDWUJRLGMBQDDLHOVT45DWZQWINRQGWPWP4DLYKVD3672AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/itemprop.cc at line 329 [6.646661]
∅:D[3.2706] → [6.660602:660670]
B:BD[6.660602] → [6.660602:660670]
```
        SK_STAVES,       HANDS_DOUBLE, SIZE_LARGE,  MI_NONE, false,
```
[3.2706]
[7.1536]
```
        SK_STAVES,       HANDS_DOUBLE, SIZE_LARGE, MI_NONE, false,
```

Replacement in crawl-ref/source/itemprop.cc at line 332 [6.646661]

B:BD[6.660767] → [4.2646:2714]

        SK_STAVES,       HANDS_DOUBLE, SIZE_LARGE,  MI_NONE, false,

[6.660767]

[7.1566]

        SK_STAVES,       HANDS_DOUBLE, SIZE_LARGE, MI_NONE, false,

Replacement in crawl-ref/source/itemprop.cc at line 1521 [6.646661]

B:BD[6.686251] → [6.686251:686330]

        if (item.base_type == OBJ_STAVES || item.sub_type == WPN_QUARTERSTAFF)

[6.686251]

[6.686330]

        if (item.base_type == OBJ_STAVES || weapon_skill(item) == SK_STAVES)

Replacement in crawl-ref/source/itemprop.cc at line 1913 [6.646661]

B:BD[6.694484] → [6.694484:694559]

    if (item.base_type == OBJ_STAVES || item.sub_type == WPN_QUARTERSTAFF)

[6.694484]

[6.694559]

    if (item.base_type == OBJ_STAVES || weapon_skill(item) == SK_STAVES)

Replacement in crawl-ref/source/itemprop.cc at line 2653 [6.646661]
B:BD[6.708683] → [8.28680:28710]
```
    return  hand == HANDS_TWO
```
[6.708683]
[8.28710]
```
    return (hand == HANDS_TWO
```
Replacement in crawl-ref/source/itemprop.cc at line 2655 [6.646661]
∅:D[8.28746] → [6.708751:708792]
B:BD[6.708751] → [6.708751:708792]
```
            && !is_range_weapon(weapon);
```
[8.28746]
[9.747]
```
            && !is_range_weapon(weapon));
```
Insertion in crawl-ref/source/item_use.cc at line 136 [11.2781507]
[10.4053]
[5.2538]
```
        && weapon_skill(*weapon) != SK_STAVES
```

Replacement in crawl-ref/source/item_use.cc at line 418 [11.2781507]

B:BD[2.397] → [2.397:451]

             && weapon->sub_type == WPN_QUARTERSTAFF)

[2.397]

[2.451]

             && weapon_skill(*weapon) == SK_STAVES)