fiddlerwoaroof/crawl - Change B7RFPXVV7Y7EXQZ5XUPB2WQYHGNZB6ERYKBTRCXENTHKW4D3FIMAC

Replace "is_random_artefact()" with "is_artefact()" in a few places where

this was missed, and add checks for unrandart and special unrandarts where applicable.

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

Created by zelgadis on June 25, 2009

B7RFPXVV7Y7EXQZ5XUPB2WQYHGNZB6ERYKBTRCXENTHKW4D3FIMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/itemprop.cc at line 909 [5.646661]
∅:D[4.4633] → [5.672677:672747]
B:BD[5.672677] → [5.672677:672747]
```
    if (item.base_type != OBJ_MISSILES || is_random_artefact( item ))
```
[4.4633]
[5.672747]
```
    if (item.base_type != OBJ_MISSILES || is_artefact( item ))
```
Replacement in crawl-ref/source/itemprop.cc at line 918 [5.646661]
∅:D[6.7474] → [7.2895:2932]
B:BD[5.672932] → [7.2895:2932]
∅:D[7.2932] → [5.672970:673050]
B:BD[5.672970] → [5.672970:673050]
```
    if (item.base_type != OBJ_ARMOUR
        || (is_random_artefact( item ) && !is_unrandom_artefact( item )))
    {
```
[6.7474]
[5.673050]
```
    if (item.base_type != OBJ_ARMOUR || is_artefact( item ))
```
Deletion in crawl-ref/source/itemprop.cc at line 920 [5.646661]
B:BD[5.673081] → [5.673081:673087]
```
    }
```
Replacement in crawl-ref/source/itemprop.cc at line 2447 [5.646661]
∅:D[8.28437] → [9.14401:14436]
B:BD[9.14401] → [9.14401:14436]
```
    if (!is_random_artefact(item))
```
[8.28437]
[10.28986]
```
    if (!is_artefact(item))
```
Replacement in crawl-ref/source/itemprop.cc at line 2511 [5.646661]
B:BD[11.11045] → [11.11045:11080]
```
    if (!is_random_artefact(item))
```
[11.11045]
[10.31536]
```
    if (!is_artefact(item))
```

Replacement in crawl-ref/source/itemname.cc at line 1198 [14.2667494]

B:BD[12.4760] → [13.2749:2812]

        if (is_random_artefact(*this) && !basename && !dbname)

[12.4760]

[14.2695518]

        if (is_artefact(*this) && !basename && !dbname)

Replacement in crawl-ref/source/itemname.cc at line 1432 [14.2667494]

B:BD[15.2993] → [2.3078:3137]

        const bool is_randart = is_random_artefact(*this);

[15.2993]

[16.11300]

        const bool is_randart = is_artefact(*this);

Replacement in crawl-ref/source/itemname.cc at line 1650 [14.2667494]
B:BD[2.3254] → [2.3254:3293]
```
        && !is_random_artefact(*this))
```
[2.3254]
[17.360339]
```
        && !is_artefact(*this))
```

Replacement in crawl-ref/source/item_use.cc at line 447 [14.2781507]

B:BD[18.23874] → [18.23874:23910]

    if (is_random_artefact( item ))

[18.23874]

[19.24108]

    if (is_special_unrandom_artefact( item ))
        i_eff = item.special;
    else if (is_artefact( item ))

Replacement in crawl-ref/source/item_use.cc at line 496 [14.2781507]
B:BD[20.5578] → [21.2538:2594]
```
    const bool artefact     = is_random_artefact(item);
```
[20.5578]
[22.3334]
```
    const bool artefact     = is_artefact(item);
```

Replacement in crawl-ref/source/item_use.cc at line 558 [14.2781507]

B:BD[14.2790508] → [19.24166:24229]

            special = artefact_wpn_property(item, ARTP_BRAND);

[14.2790508]

[19.24229]

            if (!is_special_unrandom_artefact(item))
                special = artefact_wpn_property(item, ARTP_BRAND);

Replacement in crawl-ref/source/item_use.cc at line 3144 [14.2781507]
B:BD[23.4478] → [22.4515:4571]
```
    const bool artefact     = is_random_artefact(item);
```
[23.4478]
[22.4571]
```
    const bool artefact     = is_artefact(item);
```
Replacement in crawl-ref/source/item_use.cc at line 3435 [14.2781507]
B:BD[24.2223] → [22.5946:5980]
```
    if (is_random_artefact(item))
```
[24.2223]
[24.2259]
```
    if (is_artefact(item))
```
Replacement in crawl-ref/source/item_use.cc at line 3737 [14.2781507]
B:BD[5.758497] → [5.758497:758531]
```
    if (is_random_artefact(item))
```
[5.758497]
[19.25312]
```
    if (is_artefact(item))
```
Replacement in crawl-ref/source/item_use.cc at line 5268 [14.2781507]
∅:D[25.3649] → [5.763358:763400]
B:BD[5.763358] → [5.763358:763400]
```
    ASSERT( is_random_artefact( item ) );
```
[25.3649]
[26.51049]
```
    ASSERT( is_artefact( item ) );
```
Replacement in crawl-ref/source/it_use2.cc at line 453 [14.2904329]
B:BD[14.2913208] → [27.703:743]
```
        if (is_random_artefact( item ))
```
[14.2913208]
[19.27541]
```
        if (is_artefact( item ))
```
Replacement in crawl-ref/source/it_use2.cc at line 621 [14.2904329]
B:BD[14.2918350] → [28.4667:4701]
```
    if (is_random_artefact(item))
```
[14.2918350]
[19.27576]
```
    if (is_artefact(item))
```
Replacement in crawl-ref/source/it_use2.cc at line 627 [14.2904329]
B:BD[5.767552] → [5.767552:767594]
```
    ASSERT( is_random_artefact( item ) );
```
[5.767552]
[14.2918440]
```
    ASSERT( is_artefact( item ) );
```
Replacement in crawl-ref/source/fight.cc at line 378 [14.3140790]
B:BD[18.31330] → [18.31330:31372]
```
        && is_random_artefact( *weapon ))
```
[18.31330]
[18.31372]
```
        && is_artefact( *weapon ))
```
Replacement in crawl-ref/source/fight.cc at line 2254 [14.3140790]
B:BD[29.9221] → [30.22329:22374]
```
            if (is_random_artefact(*weapon))
```
[29.9221]
[19.28819]
```
            if (is_artefact(*weapon))
```
Replacement in crawl-ref/source/fight.cc at line 3010 [14.3140790]
∅:D[31.5353] → [30.31002:31043]
B:BD[30.31002] → [30.31002:31043]
```
        if (is_random_artefact(*weapon))
```
[31.5353]
[19.28882]
```
        if (is_artefact(*weapon))
```
Replacement in crawl-ref/source/describe.cc at line 738 [14.3736416]
B:BD[3.36567] → [3.36567:36616]
```
    if (!is_random_artefact( item ) && !verbose)
```
[3.36567]
[3.36616]
```
    if (!is_artefact( item ) && !verbose)
```
Replacement in crawl-ref/source/describe.cc at line 1275 [14.3736416]
B:BD[14.3791381] → [14.3791381:3791417]
```
    if (is_random_artefact( item ))
```
[14.3791381]
[14.3791417]
```
    if (is_artefact( item ))
```
Replacement in crawl-ref/source/describe.cc at line 1354 [14.3736416]
B:BD[14.3823891] → [5.986848:986896]
```
    if ((verbose || is_random_artefact( item ))
```
[14.3814748]
[14.3823944]
```
    if ((verbose || is_artefact( item ))
```
Replacement in crawl-ref/source/describe.cc at line 1362 [14.3736416]
∅:D[32.4557] → [14.3824299:3824342]
B:BD[14.3824299] → [14.3824299:3824342]
```
            || is_random_artefact( item ))
```
[32.4557]
[14.3824342]
```
            || is_artefact( item ))
```
Replacement in crawl-ref/source/describe.cc at line 1425 [14.3736416]
B:BD[14.3826201] → [33.8021:8048]
∅:D[33.8048] → [14.3826227:3826263]
B:BD[14.3826227] → [14.3826227:3826263]
```
    // Randart properties.
    if (is_random_artefact( item ))
```
[14.3826201]
[14.3826263]
```
    // Artefact properties.
    if (is_artefact( item ))
```
Replacement in crawl-ref/source/describe.cc at line 2246 [14.3736416]
∅:D[34.3857] → [35.12333:12367]
B:BD[35.12333] → [35.12333:12367]
```
    if (is_random_artefact(item))
```
[34.3857]
[34.3858]
```
    if (is_artefact(item))
```

Replacement in crawl-ref/source/debug.cc at line 1823 [14.4016436]

B:BD[14.4042598] → [36.7903:8003]

    const bool is_art = is_artefact(you.inv[item])
        && !is_unrandom_artefact(you.inv[item]);

[14.4042598]

[36.8003]

    const bool is_art = is_artefact(you.inv[item]);

Insertion in crawl-ref/source/debug.cc at line 2004 [14.4016436]

[37.4884]

    if (is_unrandom_artefact(item))
    {
        mpr("That item is already an unrandom artefact.");
        return;
    }

Replace "is_random_artefact()" with "is_artefact()" in a few places where

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/itemprop.cc at line 909 [5.646661]

Replacement in crawl-ref/source/itemprop.cc at line 918 [5.646661]

Deletion in crawl-ref/source/itemprop.cc at line 920 [5.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2447 [5.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2511 [5.646661]

Replacement in crawl-ref/source/itemname.cc at line 1198 [14.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1432 [14.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1650 [14.2667494]

Replacement in crawl-ref/source/item_use.cc at line 447 [14.2781507]

Replacement in crawl-ref/source/item_use.cc at line 496 [14.2781507]

Replacement in crawl-ref/source/item_use.cc at line 558 [14.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3144 [14.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3435 [14.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3737 [14.2781507]

Replacement in crawl-ref/source/item_use.cc at line 5268 [14.2781507]

Replacement in crawl-ref/source/it_use2.cc at line 453 [14.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 621 [14.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 627 [14.2904329]

Replacement in crawl-ref/source/fight.cc at line 378 [14.3140790]

Replacement in crawl-ref/source/fight.cc at line 2254 [14.3140790]

Replacement in crawl-ref/source/fight.cc at line 3010 [14.3140790]

Replacement in crawl-ref/source/describe.cc at line 738 [14.3736416]

Replacement in crawl-ref/source/describe.cc at line 1275 [14.3736416]

Replacement in crawl-ref/source/describe.cc at line 1354 [14.3736416]

Replacement in crawl-ref/source/describe.cc at line 1362 [14.3736416]

Replacement in crawl-ref/source/describe.cc at line 1425 [14.3736416]

Replacement in crawl-ref/source/describe.cc at line 2246 [14.3736416]

Replacement in crawl-ref/source/debug.cc at line 1823 [14.4016436]

Insertion in crawl-ref/source/debug.cc at line 2004 [14.4016436]