fiddlerwoaroof/crawl - Change VD6OIKCECWB4XJVKI52AX2ALU7L7DFPJXGNDWM7BRLT3WPRNTFYQC

FR #2483700: give a better message than "You are not carrying any armour" when

transformed either your armour is melded into you or if none of the armour you're carrying can fit your current form.

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

Created by zelgadis on January 12, 2009

VD6OIKCECWB4XJVKI52AX2ALU7L7DFPJXGNDWM7BRLT3WPRNTFYQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/invent.cc at line 361 [4.2920632]

[3.3232]


static bool _has_tran_unwearable_armour(bool &melded)
{
    bool unwearable = false;
         melded     = false;

Insertion in crawl-ref/source/invent.cc at line 367 [4.2920632]

[3.3233]

    for (int i = 0; i < ENDOFPACK; i++)
    {
        item_def &item(you.inv[i]);
        if (is_valid_item(item) && item.base_type == OBJ_ARMOUR
            && !you_tran_can_wear(item))
        {
            unwearable = true;
            if (item_is_equipped(item))
            {
                melded = true;
                return (true);
            }
        }
    }
    return (unwearable);
}

Replacement in crawl-ref/source/invent.cc at line 395 [4.2920632]

B:BD[2.2988] → [2.2988:3039]

        return("You aren't carrying any armour.");

[2.2988]

[3.3493]

    {
        bool melded = false;
        if (_has_tran_unwearable_armour(melded))
        {
            if (melded)
                return ("Your armour is currently melded into you.");
            else
                return("You aren't carrying any armour you can wear in your "
                       "current form.");
        }
        else
            return("You aren't carrying any armour.");
    }