fiddlerwoaroof/crawl - Change RKU2FIDSJCR4GZYBI7CLCFEYXVV5KRKI2CJFDNQT7YMWXUTUG7TAC

Move the disabling of elven maces/flails and dwarven polearms into

set_equip_race(), so that it isn't duplicated for both players and monsters (both of which use this function).

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

Created by dolorous on November 29, 2007

RKU2FIDSJCR4GZYBI7CLCFEYXVV5KRKI2CJFDNQT7YMWXUTUG7TAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/newgame.cc at line 538 [5.1132300]

B:BD[3.5304] → [4.326:386]

∅:D[4.386] → [6.252:436]

B:BD[6.252] → [6.252:436]

                    if (you.inv[i].base_type != OBJ_WEAPONS
                        || weapon_skill(you.inv[i]) != SK_MACES_FLAILS)
                    {
                        set_equip_race( you.inv[i], ISFLAG_ELVEN );
                    }

[3.5304]

[3.5368]

                    set_equip_race( you.inv[i], ISFLAG_ELVEN );

Replacement in crawl-ref/source/newgame.cc at line 542 [5.1132300]

B:BD[3.5472] → [4.387:447]

∅:D[4.447] → [6.496:678]

B:BD[6.496] → [6.496:678]

                    if (you.inv[i].base_type != OBJ_WEAPONS
                        || weapon_skill(you.inv[i]) != SK_POLEARMS)
                    {
                        set_equip_race( you.inv[i], ISFLAG_DWARVEN );
                    }

[3.5472]

[3.5538]

                    set_equip_race( you.inv[i], ISFLAG_DWARVEN );

Replacement in crawl-ref/source/newgame.cc at line 548 [5.1132300]
B:BD[7.1935] → [7.1935:1956]
```
                    
```
[7.1935]
[7.1956]

Replacement in crawl-ref/source/makeitem.cc at line 973 [8.927]

B:BD[2.4018] → [2.4018:4100]

        if (weapon_skill(item) != SK_MACES_FLAILS)
            rc = ISFLAG_ELVEN;

[2.4018]

[2.4100]

        rc = ISFLAG_ELVEN;

Replacement in crawl-ref/source/makeitem.cc at line 977 [8.927]

B:BD[2.4144] → [2.4144:4224]

        if (weapon_skill(item) != SK_POLEARMS)
            rc = ISFLAG_DWARVEN;

[2.4144]

[2.4224]

        rc = ISFLAG_DWARVEN;

Replacement in crawl-ref/source/makeitem.cc at line 1625 [8.927]

B:BD[2.21829] → [2.21829:21897]

        if ((item.sub_type == MI_ARROW || item.sub_type == MI_DART)

[2.21829]

[2.21897]

        if ((item.sub_type == MI_ARROW
             || item.sub_type == MI_DART)

Replacement in crawl-ref/source/makeitem.cc at line 1640 [8.927]

B:BD[9.467] → [2.22184:22321]

        
        // Dwarves don't make arrows (or needles, see below)
        if ((item.sub_type == MI_DART || item.sub_type == MI_BOLT)

[9.467]

[2.22321]


        // Dwarves don't make arrows
        if ((item.sub_type == MI_DART
             || item.sub_type == MI_BOLT)

Insertion in crawl-ref/source/makeitem.cc at line 1649 [8.927]
[8.59752]
[2.22389]
```
        // Dwarves don't make needles
```
Replacement in crawl-ref/source/itemprop.cc at line 643 [10.646661]
B:BD[10.667909] → [10.667909:667955]
```
        if (item.sub_type >= ARM_DRAGON_HIDE 
```
[10.667909]
[10.667955]
```
        if (item.sub_type >= ARM_DRAGON_HIDE
```

Replacement in crawl-ref/source/itemprop.cc at line 667 [10.646661]

B:BD[10.668416] → [10.668416:668636]

    case ISFLAG_ELVEN: 
        if (item.base_type == OBJ_ARMOUR 
            && (item.sub_type == ARM_SPLINT_MAIL
                || item.sub_type == ARM_BANDED_MAIL
                || item.sub_type == ARM_PLATE_MAIL))

[10.668416]

[10.668636]

    case ISFLAG_ELVEN:
        if ((item.base_type == OBJ_WEAPONS
            && weapon_skill(item) == SK_MACES_FLAILS)
                || (item.base_type == OBJ_ARMOUR
                    && (item.sub_type == ARM_SPLINT_MAIL
                        || item.sub_type == ARM_BANDED_MAIL
                        || item.sub_type == ARM_PLATE_MAIL)))

Replacement in crawl-ref/source/itemprop.cc at line 678 [10.646661]

B:BD[10.668691] → [10.668691:668934]

            
    case ISFLAG_DWARVEN: 
        if (item.base_type == OBJ_ARMOUR 
            && (item.sub_type == ARM_ROBE
                || item.sub_type == ARM_LEATHER_ARMOUR
                || item.sub_type == ARM_STUDDED_LEATHER_ARMOUR))

[10.668691]

[10.668934]


    case ISFLAG_DWARVEN:
        if ((item.base_type == OBJ_WEAPONS
            && weapon_skill(item) == SK_POLEARMS)
                || (item.base_type == OBJ_ARMOUR
                    && (item.sub_type == ARM_ROBE
                        || item.sub_type == ARM_LEATHER_ARMOUR
                        || item.sub_type == ARM_STUDDED_LEATHER_ARMOUR)))

Replacement in crawl-ref/source/itemprop.cc at line 691 [10.646661]
B:BD[10.668990] → [10.668990:669015]
```
    case ISFLAG_ORCISH: 
```
[10.668990]
[10.669015]
```
    case ISFLAG_ORCISH:
```