fiddlerwoaroof/crawl - Change 3AEGGDP5NBKWDQD37ENFT6LXWOP7KBQLSFTP6ZWQ5RVQ5NY6HEAAC

Simplify.

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

Created by dolorous on June 30, 2008

3AEGGDP5NBKWDQD37ENFT6LXWOP7KBQLSFTP6ZWQ5RVQ5NY6HEAAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/makeitem.cc at line 1466 [5.927]
B:BD[5.51173] → [6.16812:16844]
```
        case WPN_DEMON_TRIDENT:
```
Insertion in crawl-ref/source/makeitem.cc at line 1468 [5.927]
[6.16903]
[6.16903]
```
        case WPN_DEMON_TRIDENT:
```
Replacement in crawl-ref/source/makeitem.cc at line 3500 [5.927]
B:BD[5.118781] → [5.118781:118828]
```
            item.sub_type = WPN_DEMON_TRIDENT;
```
[5.118781]
[5.118828]
```
            item.sub_type = WPN_DEMON_WHIP;
```
Replacement in crawl-ref/source/makeitem.cc at line 3504 [5.927]
B:BD[5.118933] → [5.118933:118977]
```
            item.sub_type = WPN_DEMON_WHIP;
```
[5.118933]
[5.118977]
```
            item.sub_type = WPN_DEMON_TRIDENT;
```

Replacement in crawl-ref/source/itemprop.h at line 670 [7.641567]

B:BD[7.644767] → [7.644767:644809]

B:BD[7.644809] → [4.2721:2769]

∅:D[4.2769] → [8.2807:2918]

B:BD[9.2911] → [8.2807:2918]

bool  is_demonic( const item_def &item );
bool  is_blessed_blade( const item_def &item );
bool  is_convertible( const item_def &item );
bool  convert2good( item_def &item, bool allow_blessed = true );

[7.644767]

[7.644809]

bool is_demonic(const item_def &item);
bool is_blessed_blade(const item_def &item);
bool is_convertible(const item_def &item);
bool convert2good(item_def &item, bool allow_blessed = true);

Replacement in crawl-ref/source/itemprop.h at line 675 [7.641567]

B:BD[7.644810] → [7.644810:644966]

int   get_vorpal_type( const item_def &item );
int   get_damage_type( const item_def &item );
bool  does_damage_type( const item_def &item, int dam_type );

[7.644810]

[7.644966]

int get_vorpal_type( const item_def &item );
int get_damage_type( const item_def &item );
bool does_damage_type( const item_def &item, int dam_type );

Replacement in crawl-ref/source/itemprop.cc at line 692 [7.646661]

∅:D[2.313] → [7.667623:667718]

B:BD[7.667623] → [7.667623:667718]

B:BD[7.667718] → [10.270:320]

            || item.sub_type == WPN_DEMON_BLADE
            || item.sub_type == WPN_DEMON_WHIP
            || item.sub_type == WPN_DEMON_TRIDENT

[2.313]

[4.2771]

            || is_demonic(item)

Deletion in crawl-ref/source/itemprop.cc at line 1453 [7.646661]
B:BD[7.684510] → [7.684510:684538]
```
    case WPN_DEMON_TRIDENT:
```
Insertion in crawl-ref/source/itemprop.cc at line 1455 [7.646661]
[7.684589]
[11.5312]
```
    case WPN_DEMON_TRIDENT:
```
Replacement in crawl-ref/source/itemprop.cc at line 1615 [7.646661]
B:BD[7.689036] → [7.689036:689076]
```
bool is_demonic( const item_def &item )
```
[7.689036]
[7.689076]
```
bool is_demonic(const item_def &item)
```
Replacement in crawl-ref/source/itemprop.cc at line 1632 [7.646661]
B:BD[7.689356] → [7.689356:689408]
```
}                               // end is_demonic()
```
[7.689356]
[7.689408]
```
}
```
Replacement in crawl-ref/source/itemprop.cc at line 1634 [7.646661]
B:BD[7.689409] → [4.2811:2857]
```
bool is_blessed_blade( const item_def &item )
```
[7.689409]
[12.2952]
```
bool is_blessed_blade(const item_def &item)
```
Replacement in crawl-ref/source/itemprop.cc at line 1658 [7.646661]
B:BD[13.3547] → [8.2920:2964]
```
bool is_convertible( const item_def &item )
```
[13.3547]
[13.3589]
```
bool is_convertible(const item_def &item)
```
Replacement in crawl-ref/source/itemprop.cc at line 1666 [7.646661]
B:BD[12.3426] → [8.3022:3078]
```
bool convert2good( item_def &item, bool allow_blessed )
```
[12.3426]
[14.3798]
```
bool convert2good(item_def &item, bool allow_blessed)
```
Replacement in crawl-ref/source/itemprop.cc at line 1738 [7.646661]
B:BD[14.4196] → [8.3079:3133]
```
}                               // end convert2good()
```
[14.4196]
[14.4256]
```
}
```

Replacement in crawl-ref/source/fight.cc at line 1447 [17.3140790]

∅:D[15.2782] → [16.986:1027]

∅:D[3.3716] → [16.986:1027]

B:BD[16.986] → [16.986:1027]

B:BD[16.1027] → [3.3717:3882]

∅:D[3.3882] → [16.1192:1202]

B:BD[16.1192] → [16.1192:1202]

        if (you.species == SP_DEMONSPAWN
            && (weapon->sub_type == WPN_DEMON_BLADE
                || weapon->sub_type == WPN_DEMON_WHIP
                || weapon->sub_type == WPN_DEMON_TRIDENT))
        {

[3.3716]

[16.1202]

        if (you.species == SP_DEMONSPAWN && is_demonic(*weapon))

Deletion in crawl-ref/source/fight.cc at line 1449 [17.3140790]
∅:D[16.1236] → [18.47271:47281]
∅:D[19.7528] → [18.47271:47281]
B:BD[18.47271] → [18.47271:47281]
```
        }
```

Simplify.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/makeitem.cc at line 1466 [5.927]

Insertion in crawl-ref/source/makeitem.cc at line 1468 [5.927]

Replacement in crawl-ref/source/makeitem.cc at line 3500 [5.927]

Replacement in crawl-ref/source/makeitem.cc at line 3504 [5.927]

Replacement in crawl-ref/source/itemprop.h at line 670 [7.641567]

Replacement in crawl-ref/source/itemprop.h at line 675 [7.641567]

Replacement in crawl-ref/source/itemprop.cc at line 692 [7.646661]

Deletion in crawl-ref/source/itemprop.cc at line 1453 [7.646661]

Insertion in crawl-ref/source/itemprop.cc at line 1455 [7.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1615 [7.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1632 [7.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1634 [7.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1658 [7.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1666 [7.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1738 [7.646661]

Replacement in crawl-ref/source/fight.cc at line 1447 [17.3140790]

Deletion in crawl-ref/source/fight.cc at line 1449 [17.3140790]