fiddlerwoaroof/crawl - Change MJRXH3WGYWQK3PONPCZSAVOKSAGVJZCLXYA476KTEBAJZ744JJXAC

[1945775] Print "Okay, then." when aborting wear/take off prompt.

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

Created by j-p-e-g on April 18, 2008

MJRXH3WGYWQK3PONPCZSAVOKSAGVJZCLXYA476KTEBAJZ744JJXAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/item_use.cc at line 774 [4.2781507]

B:BD[4.2797055] → [4.2797055:2797089]

        if (slot != PROMPT_ABORT)

[4.2797055]

[4.2797089]

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

Replacement in crawl-ref/source/item_use.cc at line 1022 [4.2781507]
B:BD[5.3048] → [5.3048:3084]
B:BD[5.3084] → [6.3405:3441]
∅:D[6.3441] → [7.3598:3642]
B:BD[7.3598] → [7.3598:3642]
B:BD[7.3642] → [6.3442:3445]
∅:D[6.3445] → [5.3084:3154]
∅:D[7.3643] → [5.3084:3154]
B:BD[5.3084] → [5.3084:3154]
```
    if ( wearing_slot(item) )
    {
//        if (Options.easy_unequip)
            return (!takeoff_armour(item));
/*
        if (!quiet)
            mpr("You are already wearing that!");
```
[5.3048]
[5.3154]
```
    if (wearing_slot(item) )
        return (!takeoff_armour(item));
```
Deletion in crawl-ref/source/item_use.cc at line 1025 [4.2781507]
B:BD[5.3155] → [5.3155:3179]
B:BD[5.3179] → [6.3446:3449]
∅:D[6.3449] → [5.3179:3186]
B:BD[5.3179] → [5.3179:3186]
```
        return (false);
*/
    }
```
Insertion in crawl-ref/source/item_use.cc at line 1049 [4.2781507]
[8.396]
[8.396]
```
            {
```
Insertion in crawl-ref/source/item_use.cc at line 1053 [4.2781507]
[5.3716]
[8.532]
```
            }
```

Replacement in crawl-ref/source/item_use.cc at line 2821 [4.2781507]

B:BD[9.2777] → [9.2777:2877]

        if ((prop_str >= you.strength || prop_int >= you.intel ||
             prop_dex >= you.dex)

[9.2777]

[3.3211]

        if ((prop_str >= you.strength || prop_int >= you.intel
                || prop_dex >= you.dex)

Insertion in crawl-ref/source/item_use.cc at line 2825 [4.2781507]

[9.2938]

[9.2938]

            if (!quiet)
                canned_msg(MSG_OK);

Replacement in crawl-ref/source/item_use.cc at line 2838 [4.2781507]

∅:D[2.5063] → [9.3296:3399]

B:BD[9.3296] → [9.3296:3399]

        if ((-prop_str >= you.strength || -prop_int >= you.intel ||
             -prop_dex >= you.dex)

[2.5063]

[3.3274]

        if ((-prop_str >= you.strength || -prop_int >= you.intel
                || -prop_dex >= you.dex)

Insertion in crawl-ref/source/item_use.cc at line 2842 [4.2781507]

[9.3460]

[9.3460]

            if (!quiet)
                canned_msg(MSG_OK);