fiddlerwoaroof/crawl - Change VOXLOCDUHOAFIKRTSISYMOA2QFY3TSHQGR7BKGGQ2VZ5BUUKUQYAC

Tweak yesnoquit some more to allow for a second alternative yes character,

and use it for the chopping prompt. Also tweak eat.lua to allow y=e for inventory as well. Oh, and finally fix beheld handling to allow diagonal movement.

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

Created by j-p-e-g on March 21, 2008

VOXLOCDUHOAFIKRTSISYMOA2QFY3TSHQGR7BKGGQ2VZ5BUUKUQYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.h at line 81 [7.217090]

B:BD[6.401] → [6.401:463]

               bool clear_after = true, char alt_yes = 'Y' );

[6.401]

[7.221772]

               bool clear_after = true, char alt_yes = 'Y', char alt_yes2 = 'Y' );

Insertion in crawl-ref/source/stuff.cc at line 831 [7.224557]

[7.239867]

[8.106055]


static std::string _list_alternative_yes(char yes1, char yes2,
                                         bool lowered = false,
                                         bool brackets = false)
{
    std::string help = "";
    bool print_yes = false;
    if (yes1 != 'Y')
    {
        if (lowered)
            help += tolower(yes1);
        else
            help += yes1;
        print_yes = true;
    }
    
    if (yes2 != 'Y' && yes2 != yes1)
    {
        if (print_yes)
            help += "/";
            
        if (lowered)
            help += tolower(yes2);
        else
            help += yes2;
        print_yes = true;
    }
    
    if (print_yes)
    {
        if (brackets)
            help = " (" + help + ")";
        else
            help = "/" + help;
    }
    
    return help;
}
static const char* _list_allowed_keys(char yes1, char yes2,
                                      bool lowered = false)
{
    std::string result = " [";
                result += (lowered ? "y" : "Y");
                result += _list_alternative_yes(yes1, yes2, lowered);
                result += (lowered ? "/n/q" : "/N/Q");
                result += "]";
                
    return (result.c_str());
}

Insertion in crawl-ref/source/stuff.cc at line 883 [7.224557]
[8.106122]
[6.465]
```
// alt_yes and alt_yes2 allow up to two synonyms for 'Y'
```

Replacement in crawl-ref/source/stuff.cc at line 885 [7.224557]

B:BD[6.524] → [6.524:572]

               bool clear_after, char alt_yes )

[6.524]

[8.106200]

               bool clear_after, char alt_yes, char alt_yes2 )

Replacement in crawl-ref/source/stuff.cc at line 890 [7.224557]

B:BD[9.619] → [5.148:285]

    std::string prompt = make_stringf("%s ", str ? str : "Buggy prompt?");
    // std::string prompt = make_stringf("%s (y/n/q) ", str);

[9.619]

[5.285]

    std::string prompt = make_stringf("%s%s ", str ? str : "Buggy prompt?",
                                      _list_allowed_keys(alt_yes, alt_yes2, safe));

Replacement in crawl-ref/source/stuff.cc at line 920 [7.224557]

B:BD[8.106897] → [10.220:276]

            mpr("[Y]es, [N]o or [Q]uit only, please.");

[8.106897]

[8.106945]

            mprf("[Y]es%s, [N]o or [Q]uit only, please.",
                 _list_alternative_yes(alt_yes, alt_yes2, false, true).c_str());

Replacement in crawl-ref/source/lua/eat.lua at line 99 [11.307163]
B:BD[11.309922] → [11.309922:309956]
```
            if answer == "y" then
```
[11.309922]
[11.309956]
```
            if answer == "y" or answer == "e" then
```

Replacement in crawl-ref/source/food.cc at line 309 [7.3043806]

B:BD[12.1247] → [3.12761:12995]

∅:D[3.12995] → [13.4194:4486]

∅:D[14.15058] → [13.4194:4486]

B:BD[13.4194] → [13.4194:4486]

B:BD[13.4486] → [3.12996:13009]

∅:D[3.13009] → [13.4486:4550]

B:BD[13.4486] → [13.4486:4550]

            mprf("%s %s? [y/n/q/c]", can_bottle_blood_from_corpse(mitm[o].plus)?
                                       "Bottle" : "Butcher",
                                     mitm[o].name(DESC_NOCAP_A).c_str());
                 
            // possible results:
            // 0 - cancel all butchery (quit)
            // 1 - say no to this butchery, continue prompting
            // 2 - OK this butchery
            // Yes, this is a hack because it's too annoying to adapt
            // yesnoquit() to this purpose.
            
            int result = 100;
            while (result == 100)

[12.1247]

[12.1457]

            snprintf(info, INFO_SIZE, "%s %s?",
                     can_bottle_blood_from_corpse(mitm[o].plus)? "Bottle" : "Butcher",
                     mitm[o].name(DESC_NOCAP_A).c_str());
                     
            const int result = yesnoquit(info, true, 'N', false, 'C', 'D');
            if ( result == -1 )

Deletion in crawl-ref/source/food.cc at line 316 [7.3043806]

B:BD[12.1471] → [13.4551:4861]

B:BD[13.4861] → [4.2639:2796]

∅:D[4.2796] → [13.4963:4995]

∅:D[14.15141] → [13.4963:4995]

B:BD[13.4963] → [13.4963:4995]

∅:D[13.4995] → [12.1525:1539]

B:BD[12.1525] → [12.1525:1539]

B:BD[12.1539] → [13.4996:5028]

∅:D[13.5028] → [12.1576:1590]

B:BD[12.1576] → [12.1576:1590]

                const int keyin = getchm(KC_CONFIRM);
                if (keyin == CK_ESCAPE || keyin == 'q' || keyin == 'Q')
                    result = 0;
                if (keyin == ' ' || keyin == '\r' || keyin == '\n' ||
                    keyin == 'n' || keyin == 'N')
                    result = 1;
                if (keyin == 'y' || keyin == 'Y' || keyin == 'c' || keyin == 'C' 
                    || keyin == 'D' )     // D for users of the old keyset
                    result = 2;
            }
            if ( result == 0 )
            {

Replacement in crawl-ref/source/food.cc at line 320 [7.3043806]
B:BD[13.5066] → [13.5066:5102]
```
            else if ( result == 2 )
```
[13.5066]
[13.5102]
```
            else if ( result == 1 )
```
Insertion in crawl-ref/source/food.cc at line 325 [7.3043806]
[12.1700]
[12.1700]
```
            // continue loop for 0
```

Replacement in crawl-ref/source/acr.cc at line 3923 [7.4397395]

∅:D[2.3703] → [15.11370:11443]

B:BD[15.11370] → [15.11370:11443]

B:BD[15.11443] → [2.3704:3831]

             int olddist = distance(you.x_pos, you.y_pos, pos.x, pos.y);
             int newdist = distance(you.x_pos + move_x, you.y_pos + move_y,
                                    pos.x, pos.y);

[2.3703]

[2.3831]

             int olddist = grid_distance(you.x_pos, you.y_pos, pos.x, pos.y);
             int newdist = grid_distance(you.x_pos + move_x, you.y_pos + move_y,
                                         pos.x, pos.y);