fiddlerwoaroof/crawl - Change ITXXL3C3XOWESEDE4TXCPJSDUSITZXBKIFM52XIC3ZRDMS4ZB43AC

If an item selected for multi-drop is inscribed with "!d" or "!*", and the

user answers "no" when asked if they're sure about it, that item is removed from the list of items to drop, rather than cancelling the entire multi-drop.

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

Created by zelgadis on September 17, 2007

ITXXL3C3XOWESEDE4TXCPJSDUSITZXBKIFM52XIC3ZRDMS4ZB43AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/items.cc at line 1835 [7.2584728]

B:BD[5.357828] → [6.638240:638473]

B:BD[6.638473] → [2.127:189]

∅:D[2.189] → [6.638537:638743]

B:BD[6.638537] → [6.638537:638743]

    items_for_multidrop = prompt_invent_items( "Drop what?",
                                               MT_DROP,
                                               -1, 
                                               drop_menu_title,
                                               true, true, 0,
                                               &Options.drop_filter,
                                               drop_selitem_text,
                                               &items_for_multidrop );

[5.357828]

[5.358173]

    std::vector<SelItem> tmp_items;
    tmp_items = prompt_invent_items( "Drop what?", MT_DROP, -1, 
                                     drop_menu_title, true, true, 0,
                                     &Options.drop_filter, drop_selitem_text,
                                     &items_for_multidrop );

Replacement in crawl-ref/source/items.cc at line 1841 [7.2584728]
B:BD[5.358174] → [6.638744:638781]
```
    if (items_for_multidrop.empty())
```
[5.358174]
[5.358200]
```
    if (tmp_items.empty())
```

Replacement in crawl-ref/source/items.cc at line 1851 [7.2584728]

B:BD[3.1116] → [3.1116:1221]

    std::sort( items_for_multidrop.begin(), items_for_multidrop.end(),
               drop_item_order );

[3.1116]

[7.2625967]

    std::sort( tmp_items.begin(), tmp_items.end(), drop_item_order );
    // If the user answers "no" to an item an with a warning inscription,
    // then remove it from the list of items to drop by not copying it
    // over to items_for_multidrop
    items_for_multidrop.clear();
    for ( unsigned int i = 0; i < tmp_items.size(); ++i )
        if ( check_warning_inscriptions( *(tmp_items[i].item), OPER_DROP))
            items_for_multidrop.push_back(tmp_items[i]);

Replacement in crawl-ref/source/items.cc at line 1861 [7.2584728]

B:BD[7.2625968] → [4.128:196]

    for ( unsigned int i = 0; i < items_for_multidrop.size(); ++i )

[7.2625968]

[4.196]

    if ( items_for_multidrop.empty() ) // only one item

Replacement in crawl-ref/source/items.cc at line 1863 [7.2584728]

B:BD[4.202] → [4.202:445]

        if ( !check_warning_inscriptions( *(items_for_multidrop[i].item),
                                          OPER_DROP))
        {
            canned_msg( MSG_OK );
            items_for_multidrop.clear();
            return;
        }

[4.202]

[4.445]

        canned_msg( MSG_OK );
        return;