fiddlerwoaroof/crawl - Change 6BCD3B7SZ4T2VPOGO562767LMFCVMKBAUMF4PQ7T5XNKSXVY7F6QC

Add minor cleanups of the new helmet handling code: use is_hard_helmet()

instead of hardcoding references to caps and wizard hats when possible.

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

Created by dolorous on December 12, 2007

6BCD3B7SZ4T2VPOGO562767LMFCVMKBAUMF4PQ7T5XNKSXVY7F6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mutation.cc at line 1802 [5.1263003]
B:BD[5.1310891] → [5.1310891:1310954]
```
    case MUT_HORNS:             // horns force your helmet off
```
[5.1310891]
[5.1310954]
```
    case MUT_HORNS:
```
Insertion in crawl-ref/source/mutation.cc at line 1806 [5.1263003]
[5.1311041]
[6.395619]
```
            // horns force hard helmets off
```

Replacement in crawl-ref/source/mutation.cc at line 1808 [5.1263003]

B:BD[6.395665] → [3.788:934]

                (you.inv[you.equip[EQ_HELMET]].sub_type == ARM_CAP ||
                 you.inv[you.equip[EQ_HELMET]].sub_type == ARM_WIZARD_HAT))

[6.395665]

[5.1311144]

                !is_hard_helmet( you.inv[you.equip[EQ_HELMET]] ))

Replacement in crawl-ref/source/mutation.cc at line 1810 [5.1263003]
B:BD[5.1311158] → [5.1311158:1311231]
```
                break;          // horns don't push caps/wizard hats off
```
[5.1311158]
[5.1311398]
```
                break;
```
Replacement in crawl-ref/source/mutation.cc at line 1816 [5.1263003]
B:BD[7.3744] → [7.3744:3753]
```
        
```
[7.3744]
[5.1311514]
Replacement in crawl-ref/source/makeitem.cc at line 1947 [8.927]
B:BD[3.1469] → [3.1469:1501]
```
        if ( coinflip() )      
```
[3.1469]
[3.1501]
```
        if ( coinflip() )
```

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

B:BD[9.1003] → [10.270:329]

            if ((is_helmet(item) && !is_hard_helmet(item))

[9.1003]

[11.398]

            if ((get_armour_slot(item) == EQ_HELMET && !is_hard_helmet(item))

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

B:BD[11.511] → [4.270:328]

            if (is_helmet(item) && !is_hard_helmet(item))

[11.511]

[11.550]

            if (get_armour_slot(item) == EQ_HELMET && !is_hard_helmet(item))

Replacement in crawl-ref/source/itemprop.cc at line 767 [6.646661]
B:BD[6.669656] → [6.669656:669698]
```
    ASSERT( item.base_type == OBJ_ARMOUR 
```
[6.669656]
[6.669698]
```
    ASSERT( item.base_type == OBJ_ARMOUR
```

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

B:BD[6.669997] → [3.3254:3361]

    if ((item.sub_type == ARM_CAP || item.sub_type == ARM_WIZARD_HAT)
        && type > THELM_DESC_PLUMED)

[6.669997]

[3.3361]

    if (!is_hard_helmet(item) && type > THELM_DESC_MAX_SOFT)

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

B:BD[6.680607] → [3.3810:3887]

            if (item.sub_type == ARM_CAP || item.sub_type == ARM_WIZARD_HAT)

[6.680607]

[6.680772]

            if (!is_hard_helmet(item))

Replacement in crawl-ref/source/itemprop.cc at line 2309 [6.646661]
B:BD[6.706439] → [6.706439:706471]
```
        case ARM_GLOVES:       
```
[6.706439]
[6.706471]
```
        case ARM_GLOVES:
```

Replacement in crawl-ref/source/itemname.cc at line 1048 [5.2667494]

B:BD[5.2687754] → [5.2687754:2687817]

        // Now that we can have "glowing elven" weapons, it's

[5.2687754]

[5.2687817]

        // Now that we can have "glowing elven" weapons, it's

Replacement in crawl-ref/source/itemname.cc at line 1155 [5.2667494]

B:BD[5.2695627] → [5.2695627:2695689]

        // Now that we can have "glowing elven" armour, it's

[5.2695627]

[5.2695689]

        // Now that we can have "glowing elven" armour, it's

Replacement in crawl-ref/source/itemname.cc at line 1167 [5.2667494]

B:BD[12.493] → [3.4086:4162]

                    || (item_typ == ARM_CAP || item_typ == ARM_WIZARD_HAT))

[12.493]

[5.2696113]

                    || (get_armour_slot( *this ) == EQ_HELMET &&
                        !is_hard_helmet( *this )))

Replacement in crawl-ref/source/itemname.cc at line 1172 [5.2667494]

B:BD[5.2696216] → [5.2696216:2696273]

                else if (item_typ != ARM_LEATHER_ARMOUR

[5.2696216]

[2.272]

                else if (item_typ != ARM_LEATHER_ARMOUR

Replacement in crawl-ref/source/itemname.cc at line 1376 [5.2667494]

∅:D[13.2993] → [5.2713963:2714099]

B:BD[5.2713963] → [5.2713963:2714099]

        // not using {tried} here because there are some confusing 
        // issues to work out with how we want to handle jewellery

[13.2993]

[5.2714099]

        // not using {tried} here because there are some confusing
        // issues to work out with how we want to handle jewellery

Replacement in crawl-ref/source/item_use.cc at line 851 [5.2781507]

B:BD[5.2800664] → [3.4915:4979]

    else if (sub_type == ARM_CAP || sub_type == ARM_WIZARD_HAT)

[5.2800664]

[5.2800848]

    else if (slot == EQ_HELMET && !is_hard_helmet( item ))

Replacement in crawl-ref/source/item_use.cc at line 853 [5.2781507]
B:BD[5.2800854] → [14.1547:1585]
```
        // caps & wiz hats always fit
```
[5.2800854]
[15.1985]
```
        // soft helmets (caps and wizard hats) always fit
```

Add minor cleanups of the new helmet handling code: use is_hard_helmet()

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mutation.cc at line 1802 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 1806 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1808 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1810 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1816 [5.1263003]

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