fiddlerwoaroof/crawl - Change T35C4BT4CWYKGMASO5FST5L3OKLIB6Q7URQGI5VWFZ4U2P6K6NXAC

Apply tiles inscription fixes to trunk.

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

Created by j-p-e-g on June 8, 2009

T35C4BT4CWYKGMASO5FST5L3OKLIB6Q7URQGI5VWFZ4U2P6K6NXAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells1.cc at line 141 [5.616635]
∅:D[3.4360] → [4.6786:6847]
B:BD[5.618614] → [4.6786:6847]
```
            // Wizard blink can move past translucent walls.
```

Insertion in crawl-ref/source/spells1.cc at line 142 [5.616635]

[6.34589]

[5.618658]

            {
                // Grid in los, no problem.

Insertion in crawl-ref/source/spells1.cc at line 145 [5.616635]
[5.618681]
[6.34590]
```
            }
```

Replacement in crawl-ref/source/monplace.cc at line 2505 [5.1641732]

B:BD[5.1677834] → [6.54892:54985]

    for ( radius_iterator ri(where, radius, true, false, !allow_centre);
          ri; ++ri)

[5.1677834]

[6.54985]

    for (radius_iterator ri(where, radius, true, false, !allow_centre);
         ri; ++ri)

Deletion in crawl-ref/source/item_use.cc at line 27 [5.2781507]
B:BD[5.2782838] → [7.2824:2840]
```
#ifdef USE_TILE
```
Deletion in crawl-ref/source/item_use.cc at line 28 [5.2781507]
B:BD[7.2859] → [7.2859:2866]
```
#endif
```

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

B:BD[8.7646] → [9.6150:6202]

∅:D[9.6202] → [8.7697:7776]

B:BD[8.7697] → [8.7697:7776]

    // Misc. items need to be wielded to be evoked.
    if (item.base_type == OBJ_MISCELLANY && item.sub_type != MISC_RUNE_OF_ZOT)

[8.7646]

[9.6203]

    // Some misc. items need to be wielded to be evoked.
    if (is_deck(item) || item.base_type == OBJ_MISCELLANY
                         && item.sub_type == MISC_LANTERN_OF_SHADOWS)
    {

Insertion in crawl-ref/source/item_use.cc at line 187 [5.2781507]
[9.6226]
[8.7797]
```
    }
```

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

B:BD[10.4694] → [11.171502:171659]

    else if (item.base_type == OBJ_MISCELLANY
             || item.base_type == OBJ_STAVES
                && item_is_rod(item)) // unwield rods/misc. items

[10.4694]

[10.4729]

    else if (you.equip[EQ_WEAPON] == idx)

Deletion in crawl-ref/source/item_use.cc at line 5430 [5.2781507]
B:BD[10.4735] → [11.171660:171761]
∅:D[12.2888] → [10.4947:4957]
∅:D[11.171761] → [10.4947:4957]
B:BD[10.4947] → [10.4947:4957]
B:BD[10.4957] → [11.171762:171825]
∅:D[13.3869] → [10.4990:5000]
∅:D[11.171825] → [10.4990:5000]
B:BD[10.4990] → [10.4990:5000]
B:BD[10.5016] → [10.5016:5022]
B:BD[10.5022] → [11.171826:171929]
∅:D[14.5564] → [15.5849466:5849472]
∅:D[11.171929] → [15.5849466:5849472]
B:BD[15.5849466] → [15.5849466:5849472]
```
        if (you.equip[EQ_WEAPON] == idx
            && check_warning_inscriptions(item, OPER_WIELD))
        {
            wield_weapon(true, PROMPT_GOT_SPECIAL); // unwield
        }
    }
    else if (you.equip[EQ_WEAPON] == idx
             && check_warning_inscriptions(item, OPER_WIELD))
    {
```

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

B:BD[11.171995] → [11.171995:172095]

    else if (_valid_weapon_swap(item)
             && check_warning_inscriptions(item, OPER_WIELD))

[11.171995]

[11.172095]

    else if (_valid_weapon_swap(item))

Deletion in crawl-ref/source/item_use.cc at line 5465 [5.2781507]
B:BD[15.5849889] → [8.10107:10166]
∅:D[8.10166] → [15.5849956:5849977]
B:BD[15.5849956] → [15.5849956:5849977]
```
        if (!check_warning_inscriptions(item, OPER_WIELD))
            return;
```
Insertion in crawl-ref/source/item_use.cc at line 5468 [5.2781507]
[15.5850047]
[15.5850047]
```
    const int type = item.base_type;
```
Replacement in crawl-ref/source/item_use.cc at line 5472 [5.2781507]
B:BD[15.5850062] → [16.4550:4578]
```
    switch (item.base_type)
```
[15.5850062]
[15.5850098]
```
    switch (type)
```
Insertion in crawl-ref/source/item_use.cc at line 5477 [5.2781507]
[15.5850440]
[17.4366]
```
        case OBJ_WANDS:
```

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

B:BD[7.2893] → [7.2893:3029]

                && (item.base_type != OBJ_MISCELLANY || is_deck(item)
                    || item.sub_type == MISC_LANTERN_OF_SHADOWS))

[7.2893]

[15.5850466]

                && (type == OBJ_WEAPONS || type == OBJ_STAVES || is_deck(item)
                    || type == OBJ_MISCELLANY
                       && item.sub_type == MISC_LANTERN_OF_SHADOWS))

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

B:BD[15.5850480] → [8.10205:10271]

∅:D[8.10271] → [18.6228:6273]

B:BD[18.6228] → [18.6228:6273]

                if (check_warning_inscriptions(item, OPER_WIELD))
                    wield_weapon(true, idx);

[15.5850480]

[18.6273]

                wield_weapon(true, idx);

Replacement in crawl-ref/source/item_use.cc at line 5487 [5.2781507]
B:BD[15.5850630] → [17.4423:4466]
```
            // Evoke misc. items and rods.
```
[15.5850630]
[7.3030]
```
            // Evoke misc. items, rods, or wands.
```

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

B:BD[15.5850661] → [8.10334:10400]

B:BD[8.10400] → [7.3071:3108]

                if (check_warning_inscriptions(item, OPER_EVOKE))
                    evoke_item(idx);

[15.5850661]

[18.6575]

                evoke_item(idx);

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

B:BD[2.3235] → [2.3235:3309]

            if (equipped && check_warning_inscriptions(item, OPER_WIELD))

[2.3235]

[18.6731]

            if (equipped)

Deletion in crawl-ref/source/item_use.cc at line 5516 [5.2781507]
B:BD[15.5851418] → [15.5851418:5851463]
B:BD[15.5851463] → [8.10697:10757]
∅:D[8.10757] → [18.7182:7213]
B:BD[18.7182] → [18.7182:7213]
```
            return;
        case OBJ_WANDS:
            if (check_warning_inscriptions(item, OPER_ZAP))
                zap_wand(idx);
```

Replacement in crawl-ref/source/it_use3.cc at line 814 [5.2870456]

B:BD[2.4117] → [2.4117:4141]

    ASSERT (slot >= 0);

[2.4117]

[2.4141]

    else if (!check_warning_inscriptions(you.inv[slot], OPER_EVOKE))
        return (false);
    ASSERT(slot >= 0);

Deletion in crawl-ref/source/it_use3.cc at line 826 [5.2870456]

B:BD[2.4337] → [2.4337:4444]

    // Check inscriptions.
    if (!check_warning_inscriptions(item, OPER_EVOKE))
        return (false);

Replacement in crawl-ref/source/it_use3.cc at line 828 [5.2870456]

B:BD[2.4522] → [2.4522:4597]

    bool did_work = false;  // Used for default "nothing happens" message.

[2.4522]

[2.4597]

    bool did_work   = false;  // Used for default "nothing happens" message.

Apply tiles inscription fixes to trunk.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spells1.cc at line 141 [5.616635]

Insertion in crawl-ref/source/spells1.cc at line 142 [5.616635]

Insertion in crawl-ref/source/spells1.cc at line 145 [5.616635]

Replacement in crawl-ref/source/monplace.cc at line 2505 [5.1641732]

Deletion in crawl-ref/source/item_use.cc at line 27 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 28 [5.2781507]

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

Insertion in crawl-ref/source/item_use.cc at line 187 [5.2781507]

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

Deletion in crawl-ref/source/item_use.cc at line 5430 [5.2781507]

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

Deletion in crawl-ref/source/item_use.cc at line 5465 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 5468 [5.2781507]

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

Insertion in crawl-ref/source/item_use.cc at line 5477 [5.2781507]