fiddlerwoaroof/crawl - Change GTGF2KDUQSER5GBEDC3E2MWMPFT72BI2Q2UG6JSJLWCOEGMYABXQC

Fix BR 2398262: tiles giving away unidentified weapon brands

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

Created by j-p-e-g on December 7, 2008

GTGF2KDUQSER5GBEDC3E2MWMPFT72BI2Q2UG6JSJLWCOEGMYABXQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/tilesdl.cc at line 192 [5.19415]
B:BD[4.1302] → [3.236:260]
```
    init_player_map();
```
Replacement in crawl-ref/source/tilesdl.cc at line 1054 [5.19415]
B:BD[5.40039] → [6.743:782]
```
    if (item.base_type == OBJ_WEAPONS)
```
[5.40039]
[6.782]
```
    if (item_type_known(item))
```

Replacement in crawl-ref/source/tilesdl.cc at line 1056 [5.19415]

B:BD[6.788] → [6.788:880]

        if (!is_fixed_artefact(item)
            && get_weapon_brand(item) != SPWPN_NORMAL)

[6.788]

[6.880]

        if (item.base_type == OBJ_WEAPONS)

Replacement in crawl-ref/source/tilesdl.cc at line 1058 [5.19415]

B:BD[6.890] → [6.890:966]

            desc.special = TILE_BRAND_FLAMING + get_weapon_brand(item) - 1;

[6.890]

[6.966]

            if (!is_fixed_artefact(item)
                && get_weapon_brand(item) != SPWPN_NORMAL)
            {
                desc.special = TILE_BRAND_FLAMING + get_weapon_brand(item) - 1;
            }

Replacement in crawl-ref/source/tilesdl.cc at line 1064 [5.19415]

B:BD[6.976] → [6.976:1071]

    }
    else if (item.base_type == OBJ_MISSILES)
    {
        switch (get_ammo_brand(item))

[6.976]

[6.1071]

        else if (item.base_type == OBJ_MISSILES)

Replacement in crawl-ref/source/tilesdl.cc at line 1066 [5.19415]

B:BD[6.1081] → [6.1081:1543]

B:BD[6.1543] → [2.236:326]

∅:D[2.326] → [6.1543:1579]

B:BD[6.1543] → [6.1543:1579]

        case SPMSL_FLAME:
            desc.special = TILE_BRAND_FLAME;
            break;
        case SPMSL_ICE:
            desc.special = TILE_BRAND_ICE;
            break;
        case SPMSL_POISONED:
            desc.special = TILE_BRAND_POISONED;
            break;
        case SPMSL_CURARE:
            desc.special = TILE_BRAND_CURARE;
            break;
        case SPMSL_RETURNING:
            desc.special = TILE_BRAND_RETURNING;
            break;
        case SPMSL_CHAOS:
            desc.special = TILE_BRAND_CHAOS;
            break;
        default:
            break;

[6.1081]

[6.1579]

            switch (get_ammo_brand(item))
            {
            case SPMSL_FLAME:
                desc.special = TILE_BRAND_FLAME;
                break;
            case SPMSL_ICE:
                desc.special = TILE_BRAND_ICE;
                break;
            case SPMSL_POISONED:
                desc.special = TILE_BRAND_POISONED;
                break;
            case SPMSL_CURARE:
                desc.special = TILE_BRAND_CURARE;
                break;
            case SPMSL_RETURNING:
                desc.special = TILE_BRAND_RETURNING;
                break;
            case SPMSL_CHAOS:
                desc.special = TILE_BRAND_CHAOS;
                break;
            default:
                break;
            }

Deletion in crawl-ref/source/tilesdl.cc at line 1091 [5.19415]
B:BD[6.1595] → [6.1595:1596]