fiddlerwoaroof/crawl - Change 4PM7YVPELDFA6GYVBXNBNR5WY7IVYOFPQSXJ4CLIT4RT3QHM3BCAC

When reading a "modification scroll" (prompt: Use on which item?)

don't list the scroll you just read as one to use it on. This fixes the ugly issue where the player, forgetting the slot of the scroll just read, uses identify on itself, thereby wasting the scroll. For enchant armour and recharging it's a moot point as they don't work on scrolls anyway, but this way you can't figure out the subtype.

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

Created by j-p-e-g on June 30, 2008

4PM7YVPELDFA6GYVBXNBNR5WY7IVYOFPQSXJ4CLIT4RT3QHM3BCAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/quiver.cc at line 147 [7.3828]

B:BD[5.3387] → [6.2917:2997]

B:BD[6.2997] → [3.2534:2584]

                                   OSEL_THROWABLE, true, true, true, '-', NULL,
                                   OPER_QUIVER );

[5.3387]

[5.3513]

                                   OSEL_THROWABLE, true, true, true, '-', -1,
                                   NULL, OPER_QUIVER );

Replacement in crawl-ref/source/item_use.cc at line 271 [10.2781507]

∅:D[8.5906] → [9.731586:731656]

∅:D[11.8999] → [9.731586:731656]

B:BD[9.731586] → [9.731586:731656]

                            true, true, true, '-', NULL, OPER_WIELD);

[11.8999]

[12.8449]

                            true, true, true, '-', -1, NULL, OPER_WIELD);

Replacement in crawl-ref/source/item_use.cc at line 788 [10.2781507]

∅:D[8.5980] → [13.80464:80526]

B:BD[9.734332] → [13.80464:80526]

                                   true, true, true, 0, NULL,

[8.5980]

[13.80526]

                                   true, true, true, 0, -1, NULL,

Replacement in crawl-ref/source/item_use.cc at line 1496 [10.2781507]

B:BD[14.6468] → [5.6523:6601]

∅:D[5.6601] → [15.2843:2891]

B:BD[14.6544] → [15.2843:2891]

                                   OSEL_THROWABLE, true, true, true, 0, NULL,
                                   OPER_FIRE );

[14.6468]

[5.6602]

                                   OSEL_THROWABLE, true, true, true, 0, -1,
                                   NULL, OPER_FIRE );

Insertion in crawl-ref/source/item_use.cc at line 3164 [10.2781507]
[16.367525]
[16.367525]
```
    {
```

Replacement in crawl-ref/source/item_use.cc at line 3166 [10.2781507]

B:BD[16.367601] → [17.259:375]

                        MT_INVLIST, OBJ_JEWELLERY, true, true, true, 0, NULL,
                        OPER_PUTON );

[16.367601]

[16.367654]

                        MT_INVLIST, OBJ_JEWELLERY, true, true, true, 0, -1,
                        NULL, OPER_PUTON );
    }

Replacement in crawl-ref/source/item_use.cc at line 3314 [10.2781507]

B:BD[18.4588] → [18.4588:4656]

                                              0, NULL, OPER_REMOVE)

[18.4588]

[18.4656]

                                              0, -1, NULL, OPER_REMOVE)

Replacement in crawl-ref/source/item_use.cc at line 3419 [10.2781507]

∅:D[19.5848593] → [8.6142:6190]

B:BD[9.759580] → [8.6142:6190]

∅:D[8.6190] → [9.759630:759677]

B:BD[9.759630] → [9.759630:759677]

B:BD[9.759677] → [13.80827:80938]

                                    MT_INVLIST,
                                    OBJ_WANDS,
                                    true, true, true, 0, NULL,
                                    OPER_ZAP );

[19.5848593]

[20.11075]

                                        MT_INVLIST,
                                        OBJ_WANDS,
                                        true, true, true, 0, -1, NULL,
                                        OPER_ZAP );

Replacement in crawl-ref/source/item_use.cc at line 3647 [10.2781507]

B:BD[21.9927] → [21.9927:9994]

                                        true, true, true, 0, NULL,

[21.9927]

[21.9994]

                                        true, true, true, 0, -1, NULL,

Replacement in crawl-ref/source/item_use.cc at line 4171 [10.2781507]
∅:D[22.3046] → [23.6471:6528]
B:BD[23.6471] → [23.6471:6528]
```
static bool scroll_modify_item(const scroll_type scroll)
```
[22.3046]
[23.6528]
```
static bool _scroll_modify_item(item_def scroll)
```

Replacement in crawl-ref/source/item_use.cc at line 4173 [10.2781507]

B:BD[23.6530] → [22.3047:3122]

∅:D[22.3122] → [23.6605:6678]

B:BD[23.6605] → [23.6605:6678]

     int item_slot = prompt_invent_item( "Use on which item?", MT_INVLIST,
                                          OSEL_ANY, true, true, false );

[23.6530]

[24.5263]

    ASSERT(scroll.base_type == OBJ_SCROLLS);

Replacement in crawl-ref/source/item_use.cc at line 4175 [10.2781507]
B:BD[24.5264] → [25.3010:3045]
∅:D[25.3045] → [23.6795:6820]
B:BD[23.6795] → [23.6795:6820]
```
     if (prompt_failed(item_slot))
         return (false);
```
[24.5264]
[23.6827]
```
    // Get the slot of the scroll just read.
    int item_slot = scroll.slot;
```

Replacement in crawl-ref/source/item_use.cc at line 4178 [10.2781507]

B:BD[23.6828] → [23.6828:6870]

     item_def &item = you.inv[item_slot];

[23.6828]

[24.5265]

    // Get the slot of the item the scroll is to be used on.
    // Ban the scroll's own slot from the prompt to avoid the stupid situation
    // where you use identify on itself.
    item_slot = prompt_invent_item("Use on which item?", MT_INVLIST,
                                   OSEL_ANY, true, true, false, 0, item_slot);

Replacement in crawl-ref/source/item_use.cc at line 4184 [10.2781507]

∅:D[24.5266] → [23.6913:6965]

B:BD[23.6913] → [23.6913:6965]

B:BD[23.6965] → [22.3123:3269]

     switch (scroll)
     {
     case SCR_IDENTIFY:
        // This can cause a stupid situation where you try to identify the
        // very scroll you just read, causing you to waste the scroll.

[24.5266]

[4.4273]

    if (prompt_failed(item_slot))
        return (false);
    item_def &item = you.inv[item_slot];
    switch (scroll.sub_type)
    {
    case SCR_IDENTIFY:

Replacement in crawl-ref/source/item_use.cc at line 4199 [10.2781507]
B:BD[23.7153] → [23.7153:7179]
```
     case SCR_RECHARGING:
```
[23.7153]
[23.7179]
```
    case SCR_RECHARGING:
```
Replacement in crawl-ref/source/item_use.cc at line 4209 [10.2781507]
∅:D[26.2892] → [23.7355:7385]
B:BD[23.7355] → [23.7355:7385]
```
     case SCR_ENCHANT_ARMOUR:
```
[26.2892]
[23.7385]
```
    case SCR_ENCHANT_ARMOUR:
```
Replacement in crawl-ref/source/item_use.cc at line 4219 [10.2781507]
∅:D[26.3048] → [23.7622:7636]
B:BD[23.7622] → [23.7622:7636]
```
     default:
```
[26.3048]
[26.3049]
```
    default:
```
Replacement in crawl-ref/source/item_use.cc at line 4222 [10.2781507]
B:BD[23.7651] → [23.7651:7658]
```
     }
```
[23.7651]
[27.5439]
```
    }
```

Replacement in crawl-ref/source/item_use.cc at line 4224 [10.2781507]

∅:D[27.5440] → [23.7664:7751]

B:BD[23.7664] → [23.7664:7751]

     // Oops, wrong item...
     canned_msg(MSG_NOTHING_HAPPENS);
     return (false);

[27.5440]

[23.7751]

    // Oops, wrong item...
    canned_msg(MSG_NOTHING_HAPPENS);
    return (false);

Replacement in crawl-ref/source/item_use.cc at line 4252 [10.2781507]

B:BD[10.2858703] → [19.5848994:5849072]

B:BD[19.5849072] → [27.5441:5558]

∅:D[27.5558] → [17.414:502]

B:BD[17.414] → [17.414:502]

    int item_slot = (slot != -1) ?
        slot :
        prompt_invent_item(
                        "Read which item?",
                        MT_INVLIST,
                        OBJ_SCROLLS,
                        true, true, true, 0, NULL,
                        OPER_READ );

[10.2858703]

[17.502]

    int item_slot = (slot != -1) ? slot
                                 : prompt_invent_item( "Read which item?",
                                                       MT_INVLIST,
                                                       OBJ_SCROLLS,
                                                       true, true, true, 0, -1,
                                                       NULL, OPER_READ );

Replacement in crawl-ref/source/item_use.cc at line 4529 [10.2781507]

B:BD[23.8089] → [23.8089:8192]

        if ( !item_type_known(scroll) )
             id_the_scroll = scroll_modify_item(which_scroll);

[23.8089]

[23.8192]

        if (!item_type_known(scroll))
            id_the_scroll = _scroll_modify_item(scroll);

Replacement in crawl-ref/source/item_use.cc at line 4532 [10.2781507]
B:BD[23.8205] → [23.8205:8232]
```
             identify(-1);
```
[23.8205]
[23.8232]
```
            identify(-1);
```

Replacement in crawl-ref/source/item_use.cc at line 4536 [10.2781507]

B:BD[23.8273] → [23.8273:8376]

        if ( !item_type_known(scroll) )
             id_the_scroll = scroll_modify_item(which_scroll);

[23.8273]

[23.8376]

        if (!item_type_known(scroll))
            id_the_scroll = _scroll_modify_item(scroll);

Replacement in crawl-ref/source/item_use.cc at line 4539 [10.2781507]
B:BD[23.8389] → [23.8389:8421]
```
             recharge_wand(-1);
```
[23.8389]
[10.2866821]
```
            recharge_wand(-1);
```

Replacement in crawl-ref/source/item_use.cc at line 4544 [10.2781507]

B:BD[28.37193] → [28.37193:37255]

            id_the_scroll = scroll_modify_item(which_scroll);

[28.37193]

[23.8525]

            id_the_scroll = _scroll_modify_item(scroll);

Replacement in crawl-ref/source/item_use.cc at line 4632 [10.2781507]

∅:D[8.6381] → [13.81873:81940]

B:BD[9.763197] → [13.81873:81940]

                                        true, true, true, 0, NULL,

[8.6381]

[13.81940]

                                        true, true, true, 0, -1, NULL,

Replacement in crawl-ref/source/invent.h at line 146 [10.2919073]

B:BD[9.769638] → [9.769638:769692]

    void load_inv_items(int item_selector = OSEL_ANY,

[9.769638]

[9.769692]

    void load_inv_items(int item_selector = OSEL_ANY, int excluded_slot = -1,

Insertion in crawl-ref/source/invent.h at line 180 [10.2919073]
[10.2919704]
[9.770448]
```
                        int excluded_slot = -1,
```
Insertion in crawl-ref/source/invent.h at line 214 [10.2919073]
[9.771243]
[9.771243]
```
                   int excluded_slot = -1,
```

Replacement in crawl-ref/source/invent.cc at line 55 [10.2920632]

B:BD[10.2921454] → [29.2626:2662]

∅:D[29.2662] → [9.771677:771733]

B:BD[9.771677] → [9.771677:771733]

static void _get_inv_items_to_show(
        std::vector<const item_def*> &v, int selector);

[10.2921454]

[9.771733]

static void _get_inv_items_to_show( std::vector<const item_def*> &v,
                                    int selector, int excluded_slot = -1);

Replacement in crawl-ref/source/invent.cc at line 367 [10.2920632]
B:BD[9.776129] → [9.776129:776177]
```
void InvMenu::load_inv_items(int item_selector,
```
[9.776129]
[9.776177]
```
void InvMenu::load_inv_items(int item_selector, int excluded_slot,
```

Replacement in crawl-ref/source/invent.cc at line 371 [10.2920632]

B:BD[9.776290] → [29.2663:2717]

    _get_inv_items_to_show(tobeshown, item_selector);

[9.776290]

[9.776343]

    _get_inv_items_to_show(tobeshown, item_selector, excluded_slot);

Insertion in crawl-ref/source/invent.cc at line 374 [10.2920632]
[9.776379]
[9.776379]
Deletion in crawl-ref/source/invent.cc at line 376 [10.2920632]
∅:D[16.372637] → [10.2922191:2922197]
∅:D[9.776402] → [10.2922191:2922197]
B:BD[10.2922191] → [10.2922191:2922197]
```
    {
```
Deletion in crawl-ref/source/invent.cc at line 377 [10.2920632]
∅:D[25.4456] → [10.2922281:2922287]
∅:D[9.776689] → [10.2922281:2922287]
B:BD[10.2922281] → [10.2922281:2922287]
```
    }
```
Deletion in crawl-ref/source/invent.cc at line 378 [10.2920632]
B:BD[9.776699] → [9.776699:776705]
```
    {
```
Deletion in crawl-ref/source/invent.cc at line 379 [10.2920632]
B:BD[9.776728] → [19.5852718:5852724]
```
    }
```

Replacement in crawl-ref/source/invent.cc at line 714 [10.2920632]

B:BD[30.19759] → [30.19759:19821]

∅:D[31.11519] → [32.409:468]

∅:D[30.19821] → [32.409:468]

B:BD[32.409] → [32.409:468]

B:BD[32.468] → [30.19822:19853]

        select = invent_select(NULL, MT_INVLIST, invent_type,
                                         MF_SINGLESELECT);
        if ( isalpha(select) )

[30.19759]

[30.19853]

        select = invent_select(NULL, MT_INVLIST, invent_type, -1,
                               MF_SINGLESELECT);
        if (isalpha(select))

Replacement in crawl-ref/source/invent.cc at line 723 [10.2920632]
B:BD[30.19980] → [30.19980:20000]
```
        else break;
```
[30.19980]
[31.11746]
```
        else
            break;
```

Replacement in crawl-ref/source/invent.cc at line 881 [10.2920632]

B:BD[10.2927039] → [29.3146:3228]

static void _get_inv_items_to_show(std::vector<const item_def*> &v, int selector)

[10.2927039]

[16.380318]

static void _get_inv_items_to_show(std::vector<const item_def*> &v,
                                   int selector, int excluded_slot)

Insertion in crawl-ref/source/invent.cc at line 887 [10.2920632]
[33.3681]
[33.3681]
```
            && you.inv[i].slot != excluded_slot
```
Insertion in crawl-ref/source/invent.cc at line 911 [10.2920632]
[2.36016]
[2.36016]
```
                             int excluded_slot,
```
Replacement in crawl-ref/source/invent.cc at line 926 [10.2920632]
B:BD[16.381318] → [9.780494:780534]
```
    menu.load_inv_items(item_selector);
```
[16.381318]
[9.780534]
```
    menu.load_inv_items(item_selector, excluded_slot);
```
Replacement in crawl-ref/source/invent.cc at line 945 [10.2920632]
∅:D[16.383946] → [10.2929111:2929159]
∅:D[9.780831] → [10.2929111:2929159]
B:BD[10.2929111] → [10.2929111:2929159]
```
}                               // end invent()
```
[9.780831]
[10.2929160]
```
}
```

Replacement in crawl-ref/source/invent.cc at line 1045 [10.2920632]

B:BD[16.386194] → [16.386194:386230]

B:BD[16.386230] → [9.781498:781754]

            int ch = invent_select(
                        prompt,
                        mtype,
                        keyin == '*'? OSEL_ANY : type_expect,
                        selmode,
                        titlefn, &items, select_filter, fn,
                        pre_select );

[16.386194]

[10.2929685]

            int ch = invent_select( prompt,
                                    mtype,
                                    keyin == '*' ? OSEL_ANY : type_expect,
                                    -1,
                                    selmode,
                                    titlefn, &items, select_filter, fn,
                                    pre_select );

Insertion in crawl-ref/source/invent.cc at line 1326 [10.2920632]
[10.2930346]
[9.783369]
```
                        int excluded_slot,
```

Replacement in crawl-ref/source/invent.cc at line 1388 [10.2920632]

B:BD[9.783759] → [34.3452:3514]

                        keyin == '*'? OSEL_ANY : type_expect,

[9.783759]

[35.279]

                        keyin == '*' ? OSEL_ANY : type_expect,
                        excluded_slot,

Replacement in crawl-ref/source/food.cc at line 711 [10.3043806]

B:BD[36.12030] → [36.12030:12093]

                                    true, true, true, 0, NULL,

[36.12030]

[36.12093]

                                    true, true, true, 0, -1, NULL,

Replacement in crawl-ref/source/food.cc at line 720 [10.3043806]

B:BD[36.12241] → [36.12241:12304]

                                    true, true, true, 0, NULL,

[36.12241]

[36.12304]

                                    true, true, true, 0, -1, NULL,

Replacement in crawl-ref/source/decks.cc at line 716 [10.3987460]

∅:D[37.2871] → [38.590:658]

B:BD[38.590] → [38.590:658]

                                         true, true, true, 0, NULL,

[37.2871]

[38.658]

                                         true, true, true, 0, -1, NULL,

Replacement in crawl-ref/source/debug.cc at line 2139 [10.4016436]

B:BD[39.1763] → [39.1763:1872]

    int i = prompt_invent_item(
                "Generate ranandart stats on which item?", MT_INVLIST, -1 );

[39.1763]

[39.1872]

    int i = prompt_invent_item( "Generate randart stats on which item?",
                                MT_INVLIST, -1 );

When reading a "modification scroll" (prompt: Use on which item?)

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/quiver.cc at line 147 [7.3828]

Replacement in crawl-ref/source/item_use.cc at line 271 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 788 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1496 [10.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3164 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3166 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3314 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3419 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3647 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4171 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4173 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4175 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4178 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4184 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4199 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4209 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4219 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4222 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4224 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4252 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4529 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4532 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4536 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4539 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4544 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4632 [10.2781507]

Replacement in crawl-ref/source/invent.h at line 146 [10.2919073]

Insertion in crawl-ref/source/invent.h at line 180 [10.2919073]

Insertion in crawl-ref/source/invent.h at line 214 [10.2919073]

Replacement in crawl-ref/source/invent.cc at line 55 [10.2920632]

Replacement in crawl-ref/source/invent.cc at line 367 [10.2920632]

Replacement in crawl-ref/source/invent.cc at line 371 [10.2920632]

Insertion in crawl-ref/source/invent.cc at line 374 [10.2920632]

Deletion in crawl-ref/source/invent.cc at line 376 [10.2920632]

Deletion in crawl-ref/source/invent.cc at line 377 [10.2920632]

Deletion in crawl-ref/source/invent.cc at line 378 [10.2920632]

Deletion in crawl-ref/source/invent.cc at line 379 [10.2920632]

Replacement in crawl-ref/source/invent.cc at line 714 [10.2920632]

Replacement in crawl-ref/source/invent.cc at line 723 [10.2920632]

Replacement in crawl-ref/source/invent.cc at line 881 [10.2920632]

Insertion in crawl-ref/source/invent.cc at line 887 [10.2920632]

Insertion in crawl-ref/source/invent.cc at line 911 [10.2920632]

Replacement in crawl-ref/source/invent.cc at line 926 [10.2920632]

Replacement in crawl-ref/source/invent.cc at line 945 [10.2920632]