fiddlerwoaroof/crawl - Change KNCEMOC5TMWHTKCWF7CMYNHLGCXOLGMTXLEIHMEFBGM5FR26GRXAC

FR 1993535: If asking the user for an item, and the player has none of the

type of item requested, then mpr() the message about it, rather than bringing up an empty menu with the message being the menu's title.

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

Created by zelgadis on June 24, 2008

KNCEMOC5TMWHTKCWF7CMYNHLGCXOLGMTXLEIHMEFBGM5FR26GRXAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 979 [5.397614]
∅:D[4.472] → [5.421695:421761]
∅:D[6.137962] → [5.421695:421761]
B:BD[5.421695] → [5.421695:421761]
```
    if (book == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
```
[4.472]
[7.422]
```
    if (prompt_failed(book))
```
Deletion in crawl-ref/source/spl-book.cc at line 981 [5.397614]
∅:D[7.443] → [5.421785:421791]
B:BD[5.421785] → [5.421785:421791]
```
    }
```
Replacement in crawl-ref/source/spells1.cc at line 437 [5.616635]
∅:D[8.230] → [5.622845:622928]
∅:D[9.447] → [5.622845:622928]
∅:D[10.4922] → [5.622845:622928]
∅:D[6.158243] → [5.622845:622928]
B:BD[5.622845] → [5.622845:622928]
```
        if (item_slot == PROMPT_ABORT)
        {
            canned_msg( MSG_OK );
```
[10.4922]
[5.622928]
```
        if (prompt_failed(item_slot))
```
Deletion in crawl-ref/source/spells1.cc at line 439 [5.616635]
B:BD[5.622948] → [5.622948:622958]
```
        }
```

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

B:BD[5.2785051] → [7.4605:4676]

    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );

[5.2785051]

[7.4676]

    if (prompt_failed(item_slot))

Deletion in crawl-ref/source/item_use.cc at line 278 [5.2781507]
B:BD[7.4700] → [7.4700:4706]
```
    }
```

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

B:BD[5.2797055] → [11.2638:2717]

        if (slot == PROMPT_ABORT)
            canned_msg(MSG_OK);
        else

[5.2797055]

[5.2797089]

        if (!prompt_failed(slot))

Replacement in crawl-ref/source/item_use.cc at line 1497 [5.2781507]
∅:D[12.2891] → [13.6593:6623]
B:BD[13.6593] → [13.6593:6623]
```
    if (slot == PROMPT_ABORT)
```
[12.2891]
[5.2811789]
```
    if (slot == PROMPT_ABORT || slot == PROMPT_NOTHING)
```
Replacement in crawl-ref/source/item_use.cc at line 3107 [5.2781507]
B:BD[14.367655] → [14.367655:367726]
```
    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
```
[14.367655]
[14.367726]
```
    if (prompt_failed(item_slot))
```
Deletion in crawl-ref/source/item_use.cc at line 3109 [5.2781507]
B:BD[14.367750] → [14.367750:367756]
```
    }
```

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

B:BD[5.2837776] → [5.2837776:2837856]

        if (equipn == PROMPT_ABORT)
        {
            canned_msg( MSG_OK );

[5.2837776]

[14.368100]

        if (prompt_failed(equipn))

Deletion in crawl-ref/source/item_use.cc at line 3256 [5.2781507]
∅:D[14.368128] → [5.2837876:2837886]
B:BD[5.2837876] → [5.2837876:2837886]
```
        }
```
Replacement in crawl-ref/source/item_use.cc at line 3362 [5.2781507]
∅:D[10.11082] → [5.2841531:2841602]
∅:D[15.80938] → [5.2841531:2841602]
∅:D[6.759732] → [5.2841531:2841602]
B:BD[5.2841531] → [5.2841531:2841602]
```
    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
```
[10.11082]
[5.2841602]
```
    if (prompt_failed(item_slot))
```
Deletion in crawl-ref/source/item_use.cc at line 3364 [5.2781507]
B:BD[5.2841618] → [5.2841618:2841624]
```
    }
```
Replacement in crawl-ref/source/item_use.cc at line 3527 [5.2781507]
∅:D[16.12207] → [6.760979:761050]
B:BD[6.760979] → [6.760979:761050]
```
    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
```
[16.12207]
[6.761050]
```
    if (prompt_failed(item_slot))
```
Deletion in crawl-ref/source/item_use.cc at line 3529 [5.2781507]
B:BD[6.761066] → [6.761066:761072]
```
    }
```
Replacement in crawl-ref/source/item_use.cc at line 3581 [5.2781507]
∅:D[17.7701] → [5.2845716:2845787]
∅:D[18.10048] → [5.2845716:2845787]
∅:D[15.81635] → [5.2845716:2845787]
∅:D[6.761426] → [5.2845716:2845787]
B:BD[5.2845716] → [5.2845716:2845787]
```
    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
```
[17.7701]
[5.2845787]
```
    if (prompt_failed(item_slot))
```
Deletion in crawl-ref/source/item_use.cc at line 3583 [5.2781507]
B:BD[5.2845803] → [5.2845803:2845809]
```
    }
```
Replacement in crawl-ref/source/item_use.cc at line 4103 [5.2781507]
∅:D[19.5264] → [9.6721:6795]
B:BD[9.6721] → [9.6721:6795]
```
     if (item_slot == PROMPT_ABORT)
     {
         canned_msg( MSG_OK );
```
[19.5264]
[9.6795]
```
     if (prompt_failed(item_slot))
```
Deletion in crawl-ref/source/item_use.cc at line 4105 [5.2781507]
B:BD[9.6820] → [9.6820:6827]
```
     }
```
Replacement in crawl-ref/source/item_use.cc at line 4183 [5.2781507]
∅:D[20.503] → [5.2858778:2858849]
∅:D[6.762229] → [5.2858778:2858849]
B:BD[5.2858778] → [5.2858778:2858849]
```
    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
```
[20.503]
[5.2858849]
```
    if (prompt_failed(item_slot))
```
Deletion in crawl-ref/source/item_use.cc at line 4185 [5.2781507]
B:BD[5.2858865] → [5.2858865:2858871]
```
    }
```
Replacement in crawl-ref/source/item_use.cc at line 4558 [5.2781507]
∅:D[15.81996] → [5.2868234:2868305]
∅:D[6.763250] → [5.2868234:2868305]
B:BD[5.2868234] → [5.2868234:2868305]
```
    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
```
[15.81996]
[5.2868305]
```
    if (prompt_failed(item_slot))
```
Deletion in crawl-ref/source/item_use.cc at line 4560 [5.2781507]
B:BD[5.2868321] → [5.2868321:2868327]
```
    }
```
Insertion in crawl-ref/source/invent.h at line 38 [5.2919073]
[5.2919426]
[14.368515]
```
#define PROMPT_NOTHING      -3
```
Insertion in crawl-ref/source/invent.h at line 235 [5.2919073]
[14.370197]
[5.2920590]
```
bool prompt_failed(int retval, std::string msg = "");
```
Insertion in crawl-ref/source/invent.cc at line 48 [5.2920632]
[21.3293]
[22.5852697]
```
#include "state.h"
```

Insertion in crawl-ref/source/invent.cc at line 327 [5.2920632]

[6.776126]

}
static std::string _no_selectables_message(int item_selector)
{
    switch (item_selector)
    {
    case OSEL_ANY:
        return("You aren't carrying anything.");
    case OSEL_WIELD:
    case OBJ_WEAPONS:
        return("You aren't carrying any weapons.");
    case OSEL_UNIDENT:
        return("You don't have any unidentified items.");
    case OSEL_MEMORISE:
        return("You aren't carrying any spellbooks.");
    case OSEL_RECHARGE:
        return("You aren't carrying any rechargable items.");
    case OSEL_ENCH_ARM:
    case OBJ_ARMOUR:
        return("You aren't carrying any armour which can be enchanted "
               "further.");
    case OBJ_CORPSES:
    case OSEL_VAMP_EAT:
        return("You aren't carrying any corpses which you can drain.");
    case OSEL_DRAW_DECK:
        return("You aren't carrying any decks from which to draw.");
    case OBJ_FOOD:
        return("You aren't carrying any food.");
    case OBJ_SCROLLS:
    case OBJ_BOOKS:
        return("You aren't carrying any books or scrolls.");
    case OBJ_WANDS:
        return("You aren't carrying any wands.");
    }
    return("You aren't carrying any such object.");

Replacement in crawl-ref/source/invent.cc at line 374 [5.2920632]

B:BD[5.2922197] → [6.776403:776457]

∅:D[14.372667] → [5.2922230:2922240]

∅:D[6.776457] → [5.2922230:2922240]

B:BD[5.2922230] → [5.2922230:2922240]

B:BD[5.2922240] → [6.776458:776530]

∅:D[6.776530] → [14.372795:372814]

B:BD[14.372795] → [14.372795:372814]

B:BD[14.372814] → [6.776531:776556]

∅:D[6.776556] → [14.372814:372840]

B:BD[14.372814] → [14.372814:372840]

B:BD[14.372840] → [6.776557:776609]

∅:D[6.776609] → [14.373441:373460]

B:BD[14.373441] → [14.373441:373460]

B:BD[14.373460] → [23.335:420]

B:BD[23.420] → [3.2644:3511]

∅:D[3.3511] → [23.420:439]

B:BD[23.420] → [23.420:439]

B:BD[23.439] → [3.3512:3605]

∅:D[23.439] → [14.373714:373731]

∅:D[3.3605] → [14.373714:373731]

B:BD[14.373714] → [14.373714:373731]

B:BD[14.373731] → [6.776610:776666]

∅:D[6.776666] → [14.373731:373750]

B:BD[14.373731] → [14.373731:373750]

∅:D[14.373750] → [5.2922271:2922281]

B:BD[5.2922271] → [5.2922271:2922281]

B:BD[5.2922281] → [6.776667:776689]

        std::string s;
        switch (item_selector)
        {
        case OSEL_ANY:
            s = "You aren't carrying anything.";
            break;
        case OSEL_WIELD:
        case OBJ_WEAPONS:
            s = "You aren't carrying any weapons.";
            break;
        case OSEL_UNIDENT:
            s = "You don't have any unidentified items.";
            break;
        case OSEL_MEMORISE:
            s = "You aren't carrying any spellbooks.";
            break;
        case OSEL_RECHARGE:
            s = "You aren't carrying any rechargable items.";
            break;
        case OSEL_ENCH_ARM:
        case OBJ_ARMOUR:
            s = "You aren't carrying any armour which can be enchanted "
                "further.";
            break;
        case OBJ_CORPSES:
        case OSEL_VAMP_EAT:
            s = "You aren't carrying any corpses which you can drain.";
            break;
        case OSEL_DRAW_DECK:
            s = "You aren't carrying any decks from which to draw.";
            break;
        case OBJ_FOOD:
            s = "You aren't carrying any food.";
            break;
        case OBJ_SCROLLS:
        case OBJ_BOOKS:
            s = "You aren't carrying any books or scrolls.";
            break;
        case OBJ_WANDS:
            s = "You aren't carrying any wands.";
            break;
        default:
            s = "You aren't carrying any such object.";
            break;
        }
        set_title(s);

[5.2922197]

[5.2922281]

        set_title(_no_selectables_message(item_selector));

Insertion in crawl-ref/source/invent.cc at line 864 [5.2920632]

[14.380487]

[2.3748]

        }
    }
}
static bool _any_items_to_select(int selector)
{
    for (int i = 0; i < ENDOFPACK; i++)
    {
        if (is_valid_item(you.inv[i])
            && _is_item_selected(you.inv[i], selector))
        {
            return true;

Insertion in crawl-ref/source/invent.cc at line 878 [5.2920632]
[14.380493]
[14.380797]
```
    return false;
```
Insertion in crawl-ref/source/invent.cc at line 1290 [5.2920632]
[5.2930055]
[5.2930055]
```
// It retursn PROMPT_NOTHING     if there's no matching items
```

Insertion in crawl-ref/source/invent.cc at line 1301 [5.2920632]

[5.2930391]

    if (!_any_items_to_select(type_expect) && type_expect != OSEL_WIELD
        && mtype == MT_INVLIST)
    {
        mprf(MSGCH_PROMPT, "%s",
             _no_selectables_message(type_expect).c_str());
        return (PROMPT_NOTHING);
    }

Replacement in crawl-ref/source/invent.cc at line 1310 [5.2920632]
B:BD[5.2930421] → [6.783459:783498]
```
    int            ret = PROMPT_ABORT;
```
[5.2930421]
[5.2930450]
```
    int            ret = PROMPT_ABORT; 
```

Replacement in crawl-ref/source/invent.cc at line 1320 [5.2920632]

B:BD[6.783633] → [6.783633:783660]

        keyin       = '?';

[6.783633]

[5.2931009]


        if (_any_items_to_select(type_expect))
            keyin = '?';
        else
            keyin = '*';

Insertion in crawl-ref/source/invent.cc at line 1431 [5.2920632]

[6.784675]


bool prompt_failed(int retval, std::string msg)
{
    if (retval != PROMPT_ABORT && retval != PROMPT_NOTHING)
        return false;
    if (msg.empty())
    {
        if (retval == PROMPT_ABORT)
            canned_msg(MSG_OK);
    }
    else
        mprf(MSGCH_PROMPT, msg.c_str());
    crawl_state.cancel_cmd_repeat();
    return true;
}

Replacement in crawl-ref/source/food.cc at line 723 [5.3043806]
∅:D[24.3293] → [5.3058879:3058961]
∅:D[25.8003] → [5.3058879:3058961]
∅:D[14.429458] → [5.3058879:3058961]
∅:D[6.853816] → [5.3058879:3058961]
B:BD[5.3058879] → [5.3058879:3058961]
```
    if (which_inventory_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
```
[24.3293]
[14.429459]
```
    if (prompt_failed(which_inventory_slot))
```
Deletion in crawl-ref/source/food.cc at line 725 [5.3043806]
∅:D[14.429483] → [5.3058977:3058983]
B:BD[5.3058977] → [5.3058977:3058983]
```
    }
```

Replacement in crawl-ref/source/effects.cc at line 1766 [5.3382105]

B:BD[9.9315] → [9.9315:9386]

    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );

[9.9315]

[5.3425375]

    if (prompt_failed(item_slot))

Deletion in crawl-ref/source/effects.cc at line 1768 [5.3382105]
B:BD[5.3425399] → [9.9387:9393]
```
    }
```
Replacement in crawl-ref/source/decks.cc at line 715 [5.3987460]
∅:D[26.718] → [27.827:893]
∅:D[28.9837] → [27.827:893]
B:BD[27.827] → [27.827:893]
```
    if ( slot == PROMPT_ABORT )
    {
        canned_msg(MSG_OK);
```
[28.9837]
[26.719]
```
    if (prompt_failed(slot))
```
Deletion in crawl-ref/source/decks.cc at line 717 [5.3987460]
∅:D[26.738] → [27.915:921]
B:BD[27.915] → [27.915:921]
```
    }
```
Replacement in crawl-ref/source/command.cc at line 333 [5.4082507]
∅:D[29.15431] → [5.4084398:4084469]
∅:D[6.1186198] → [5.4084398:4084469]
B:BD[5.4084398] → [5.4084398:4084469]
```
    if (from_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
```
[29.15431]
[5.4084469]
```
    if (prompt_failed(from_slot))
```
Deletion in crawl-ref/source/command.cc at line 335 [5.4082507]
B:BD[5.4084485] → [5.4084485:4084491]
```
    }
```

FR 1993535: If asking the user for an item, and the player has none of the

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 979 [5.397614]

Deletion in crawl-ref/source/spl-book.cc at line 981 [5.397614]

Replacement in crawl-ref/source/spells1.cc at line 437 [5.616635]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/invent.h at line 38 [5.2919073]

Insertion in crawl-ref/source/invent.h at line 235 [5.2919073]

Insertion in crawl-ref/source/invent.cc at line 48 [5.2920632]

Insertion in crawl-ref/source/invent.cc at line 327 [5.2920632]

Replacement in crawl-ref/source/invent.cc at line 374 [5.2920632]

Insertion in crawl-ref/source/invent.cc at line 864 [5.2920632]

Insertion in crawl-ref/source/invent.cc at line 878 [5.2920632]

Insertion in crawl-ref/source/invent.cc at line 1290 [5.2920632]

Insertion in crawl-ref/source/invent.cc at line 1301 [5.2920632]

Replacement in crawl-ref/source/invent.cc at line 1310 [5.2920632]

Replacement in crawl-ref/source/invent.cc at line 1320 [5.2920632]

Insertion in crawl-ref/source/invent.cc at line 1431 [5.2920632]

Replacement in crawl-ref/source/food.cc at line 723 [5.3043806]

Deletion in crawl-ref/source/food.cc at line 725 [5.3043806]

Replacement in crawl-ref/source/effects.cc at line 1766 [5.3382105]

Deletion in crawl-ref/source/effects.cc at line 1768 [5.3382105]

Replacement in crawl-ref/source/decks.cc at line 715 [5.3987460]

Deletion in crawl-ref/source/decks.cc at line 717 [5.3987460]

Replacement in crawl-ref/source/command.cc at line 333 [5.4082507]

Deletion in crawl-ref/source/command.cc at line 335 [5.4082507]