fiddlerwoaroof/crawl - Change YHSVOROKPYS33Y4RYZRVZTE3G5LXOFX52HEDNLV6HIXOJYNOKH3QC

[1622126] Fixed shift+direction keys canceling the targeting prompt. Hopefully

this works on Windows and DOS, but I'm unsure.

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

Created by dshaligram on December 29, 2006

YHSVOROKPYS33Y4RYZRVZTE3G5LXOFX52HEDNLV6HIXOJYNOKH3QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 2119 [7.16817]

B:BD[3.3528] → [3.3528:3742]


        getty = getchm(KC_LEVELMAP);
        if (getty == 0)
        {
            getty = getchm(KC_LEVELMAP);
            // [dshaligram] DOS madness.
            getty = dos_direction_unmunge(getty);
        }

Replacement in crawl-ref/source/view.cc at line 2120 [7.16817]

B:BD[3.3743] → [3.3743:4173]

#if defined(WIN32CONSOLE) || defined(DOS)
        // Translate shifted numpad to shifted vi keys. Yes,
        // this is horribly hacky.
        {
            static int win_keypad[] = { 'B', 'J', 'N', 
                                        'H', '5', 'L',
                                        'Y', 'K', 'U' };
            if (getty >= '1' && getty <= '9')
                getty = win_keypad[ getty - '1' ];
        }
#endif

[3.3743]

[3.4173]

        getty = unmangle_direction_keys(getchm(KC_LEVELMAP), KC_LEVELMAP);

Insertion in crawl-ref/source/spells1.cc at line 75 [7.616635]

[7.618498]

[8.152884]

                if (!yesno("Are you sure you want to cancel this blink?",
                           false, 'n'))
                {
                    mesclr();
                    continue;
                }

Replacement in crawl-ref/source/macro.h at line 27 [7.2456702]
B:BD[9.274355] → [9.274355:274403]
```
    KC_DEFAULT,         // For no-arg getchm().
```
[9.274355]
[9.274403]
```
    KC_DEFAULT,         // For no-arg getchm(), must be zero.
```

Insertion in crawl-ref/source/libutil.h at line 22 [7.2493627]

[8.619313]

// Converts a key to a direction key, converting keypad and other sequences
// to vi key sequences (shifted/control key directions are also handled). Non
// direction keys (hopefully) pass through unmangled.
int unmangle_direction_keys(int keyin, int keymap = 0);

Insertion in crawl-ref/source/libutil.cc at line 19 [7.2494093]
[9.324287]
[7.2494309]
```
#include "macro.h"
```

Insertion in crawl-ref/source/libutil.cc at line 46 [7.2494093]

[9.324702]

#endif
#ifdef UNIX
static keycode_type numpad2vi(keycode_type key)
{
    if (key >= '1' && key <= '9')
    {
        const char *vikeys = "bjnh.lyku";
        return keycode_type(vikeys[key - '1']);
    }
    return (key);
}

Insertion in crawl-ref/source/libutil.cc at line 59 [7.2494093]

[9.324709]


int unmangle_direction_keys(int keyin, int km)
{
    const KeymapContext keymap = static_cast<KeymapContext>(km);
#ifdef UNIX
    // Kludging running and opening as two character sequences
    // for Unix systems.  This is an easy way out... all the
    // player has to do is find a termcap and numlock setting
    // that will get curses the numbers from the keypad.  This
    // will hopefully be easy.

Insertion in crawl-ref/source/libutil.cc at line 70 [7.2494093]

[9.324710]

    /* can we say yuck? -- haranp */
    if (keyin == '*')
    {
        keyin = getchm(keymap);
        // return control-key
        keyin = CONTROL(toupper(numpad2vi(keyin)));
    }
    else if (keyin == '/')
    {
        keyin = getchm(keymap);
        // return shift-key
        keyin = toupper(numpad2vi(keyin));
    }
#else
    // Old DOS keypad support
    if (keyin == 0)
    {
        /* FIXME haranp - hackiness */
        const char DOSidiocy[10]     = { "OPQKSMGHI" };
        const char DOSunidiocy[10]   = { "bjnh.lyku" };
        const int DOScontrolidiocy[9] = {
            117, 145, 118, 115, 76, 116, 119, 141, 132
        };
        keyin = getchm(keymap);
        for (int j = 0; j < 9; ++j ) {
            if (keyin == DOSidiocy[j]) {
                keyin = DOSunidiocy[j];
                break;
            }
            if (keyin == DOScontrolidiocy[j]) {
                keyin = CONTROL(toupper(DOSunidiocy[j]));
                break;
            }
        }
    }
#endif
    return (keyin);
}

Insertion in crawl-ref/source/externs.h at line 1104 [7.3270163]
[6.7158]
[8.903195]
```
typedef int keycode_type;
```

Deletion in crawl-ref/source/direct.cc at line 81 [7.3697945]

B:BD[9.451550] → [8.975258:975368]

static const char DOSidiocy[10]     = { "OPQKSMGHI" };
static const char DOSunidiocy[10]   = { "bjnh.lyku" };

Replacement in crawl-ref/source/direct.cc at line 101 [7.3697945]
B:BD[8.975372] → [8.975372:975410]
```
int dos_direction_unmunge(int doskey)
```
[8.975372]
[8.975410]
```
static int read_direction_key()
```

Replacement in crawl-ref/source/direct.cc at line 103 [7.3697945]

B:BD[8.975412] → [8.975412:975520]

    const char *pos = strchr(DOSidiocy, doskey);
    return (pos? DOSunidiocy[ pos - DOSidiocy ] : doskey);

[8.975412]

[9.452151]

    return unmangle_direction_keys(getchm(KC_TARGETING), KC_TARGETING);

Replacement in crawl-ref/source/direct.cc at line 139 [7.3697945]

B:BD[7.3700649] → [7.3700649:3700706]

    bool dirChosen = false;
    bool targChosen = false;

[7.3700649]

[7.3700706]

    bool dir_chosen = false;
    bool targ_chosen = false;

Replacement in crawl-ref/source/direct.cc at line 155 [7.3697945]

B:BD[7.3701051] → [9.452154:452192]

    int keyin = getchm(KC_TARGETING);

[7.3701051]

[7.3701076]

    int keyin = read_direction_key();
    if (keyin == 0)
        return;

Replacement in crawl-ref/source/direct.cc at line 160 [7.3697945]
B:BD[7.3701077] → [7.3701077:3701151]
```
    if (keyin == 0)             // DOS idiocy (emulated by win32 console)
```
[7.3701077]
[7.3701151]
```
    if (strchr( dirchars, keyin ) != NULL)
```

Replacement in crawl-ref/source/direct.cc at line 162 [7.3697945]

B:BD[7.3701157] → [9.452193:452247]

∅:D[9.452247] → [7.3701198:3701496]

B:BD[7.3701198] → [7.3701198:3701496]

        keyin = getchm(KC_TARGETING);        // grrr.
        if (keyin == '*')
        {
            targChosen = true;
            dir = 0;
        }
        else
        {
            if (strchr(DOSidiocy, keyin) == NULL)
                return;
            dirChosen = true;
            dir = (int)(strchr(DOSidiocy, keyin) - DOSidiocy);
        }

[7.3701157]

[7.3701496]

        dir_chosen = true;
        dir = (int)(strchr(dirchars, keyin) - dirchars) / 2;
    }
    else if (strchr( dirchars, tolower(keyin) ) != NULL)
    {
        dir_chosen = true;
        dir = (int)(strchr(dirchars, keyin) - dirchars) / 2;

Replacement in crawl-ref/source/direct.cc at line 172 [7.3697945]

B:BD[7.3701517] → [7.3701517:3701692]

        if (strchr( dirchars, keyin ) != NULL)
        {
            dirChosen = true;
            dir = (int)(strchr(dirchars, keyin) - dirchars) / 2;
        }
        else

[7.3701517]

[7.3701692]

        switch (keyin)

Replacement in crawl-ref/source/direct.cc at line 174 [7.3697945]

B:BD[7.3701702] → [7.3701702:3702471]

B:BD[7.3702471] → [9.452248:452275]

            switch (keyin)
            {
                case CONTROL('F'):
                    mode = (mode + 1) % TARG_NUM_MODES;
                    
                    snprintf( info, INFO_SIZE, "Targeting mode is now: %s", 
                              (mode == TARG_ANY)   ? "any" :
                              (mode == TARG_ENEMY) ? "enemies" 
                                                   : "friends" );
                    mpr( info );
                    targChosen = true;
                    dir = 0;
                    break;
                case '-':
                    targChosen = true;
                    dir = -1;
                    break;
                case '*':
                    targChosen = true;
                    dir = 0;
                    break;

[7.3701702]

[9.452275]

        case CONTROL('F'):
            mode = (mode + 1) % TARG_NUM_MODES;
            snprintf( info, INFO_SIZE, "Targeting mode is now: %s", 
                      (mode == TARG_ANY)   ? "any" :
                      (mode == TARG_ENEMY) ? "enemies" 
                      : "friends" );
            mpr( info );
            targ_chosen = true;
            dir = 0;
            break;
            
        case '-':
            targ_chosen = true;
            dir = -1;
            break;
            
        case '*':
            targ_chosen = true;
            dir = 0;
            break;
            
        case ';':
            targ_chosen = true;
            dir        = -3;
            break;

Replacement in crawl-ref/source/direct.cc at line 200 [7.3697945]

B:BD[9.452276] → [9.452276:452378]

∅:D[9.452378] → [7.3702471:3702499]

B:BD[7.3702471] → [7.3702471:3702499]

B:BD[7.3702499] → [9.452379:452509]

                case ';':
                    targChosen = true;
                    dir        = -3;
                    break;
                case '\'':
                    targChosen = true;
                    dir        = -2;
                    break;

[9.452276]

[9.452509]

        case '\'':
            targ_chosen = true;
            dir        = -2;
            break;

Replacement in crawl-ref/source/direct.cc at line 205 [7.3697945]

∅:D[9.452530] → [7.3702499:3702646]

B:BD[7.3702499] → [7.3702499:3702646]

                case '+':
                case '=':
                    targChosen = true;
                    dir = 1;
                    break;

[9.452530]

[7.3702646]

        case '+':
        case '=':
            targ_chosen = true;
            dir = 1;
            break;

Replacement in crawl-ref/source/direct.cc at line 211 [7.3697945]

B:BD[7.3702647] → [7.3702647:3702699]

B:BD[7.3702699] → [2.199:225]

∅:D[2.225] → [7.3702699:3702794]

B:BD[7.3702699] → [7.3702699:3702794]

                case 't':
                case 'p':
                case 'f':
                    targChosen = true;
                    dir = 2;
                    break;

[7.3702647]

[7.3702794]

        case 't':
        case 'p':
        case 'f':
            targ_chosen = true;
            dir = 2;
            break;

Replacement in crawl-ref/source/direct.cc at line 218 [7.3697945]

B:BD[7.3702795] → [9.452531:452677]

                case '.':
                case '5':
                    dirChosen = true;
                    dir = 4;
                    break;

[7.3702795]

[9.452677]

        case '.':
        case '5':
            dir_chosen = true;
            dir = 4;
            break;

Replacement in crawl-ref/source/direct.cc at line 224 [7.3697945]

∅:D[9.452678] → [7.3702795:3702895]

B:BD[7.3702795] → [7.3702795:3702895]

                case ESCAPE:
                    moves.isCancel = true;
                    return;

[9.452678]

[7.3702895]

        case ESCAPE:
            moves.isCancel = true;
            return;

Replacement in crawl-ref/source/direct.cc at line 228 [7.3697945]

B:BD[7.3702896] → [7.3702896:3702962]

                default:
                    break;
            }

[7.3702896]

[7.3702962]

        default:
            break;

Replacement in crawl-ref/source/direct.cc at line 234 [7.3697945]

B:BD[7.3703038] → [7.3703038:3703113]

    if (!(targChosen || dirChosen) || (targChosen && restrict == DIR_DIR))

[7.3703038]

[7.3703113]

    if (!(targ_chosen || dir_chosen) || (targ_chosen && restrict == DIR_DIR))

Replacement in crawl-ref/source/direct.cc at line 241 [7.3697945]
B:BD[7.3703260] → [7.3703260:3703305]
```
    if (dirChosen && restrict == DIR_TARGET)
```
[7.3703260]
[7.3703305]
```
    if (dir_chosen && restrict == DIR_TARGET)
```
Replacement in crawl-ref/source/direct.cc at line 244 [7.3697945]
B:BD[7.3703336] → [7.3703336:3703384]
```
        look_around( moves, false, dir, mode );
```
[7.3703336]
[7.3703384]
```
        look_around( moves, false, keyin, mode );
```
Replacement in crawl-ref/source/direct.cc at line 248 [7.3697945]
B:BD[7.3703407] → [7.3703407:3703427]
```
    if (targChosen)
```
[7.3703407]
[7.3703427]
```
    if (targ_chosen)
```

Replacement in crawl-ref/source/direct.cc at line 387 [7.3697945]

B:BD[7.3706055] → [7.3706055:3706112]

    bool dirChosen = false;
    bool targChosen = false;

[7.3706055]

[7.3706112]

    bool dir_chosen = false;
    bool targ_chosen = false;
    bool shifted_direction = true;

Replacement in crawl-ref/source/direct.cc at line 406 [7.3697945]
B:BD[7.3706481] → [7.3706481:3706520]
```
        keyin = (int)'1' + first_move;
```
[7.3706481]
[7.3706520]
```
        keyin = first_move;
```

Replacement in crawl-ref/source/direct.cc at line 421 [7.3697945]

B:BD[7.3706735] → [7.3706735:3706790]

        dirChosen = false;
        targChosen = false;

[7.3706735]

[7.3706790]

        dir_chosen = false;
        targ_chosen = false;
        shifted_direction = false;

Replacement in crawl-ref/source/direct.cc at line 431 [7.3697945]

B:BD[7.3706925] → [9.453376:453418]

            keyin = getchm(KC_TARGETING);

[7.3706925]

[9.453418]

            keyin = unmangle_direction_keys(getchm(KC_TARGETING), KC_TARGETING);

Replacement in crawl-ref/source/direct.cc at line 446 [7.3697945]
B:BD[7.3706955] → [7.3706955:3707001]
```
        // DOS idiocy
        if (keyin == 0)
```
[7.3706955]
[7.3707001]
```
        if (strchr(dirchars, keyin) != NULL)
```

Replacement in crawl-ref/source/direct.cc at line 448 [7.3697945]

B:BD[7.3707011] → [7.3707011:3707047]

B:BD[7.3707047] → [9.453820:453862]

∅:D[9.453862] → [7.3707076:3707367]

B:BD[7.3707076] → [7.3707076:3707367]

            // get the extended key
            keyin = getchm(KC_TARGETING);
            // look for CR - change to '5' to indicate selection
            if (keyin == 13)
                keyin = 'S';
            if (strchr(DOSidiocy, keyin) == NULL)
                break;
            dirChosen = true;
            dir = (int)(strchr(DOSidiocy, keyin) - DOSidiocy);

[7.3707011]

[7.3707367]

            dir_chosen = true;
            dir = (int)(strchr(dirchars, keyin) - dirchars) / 2;
        }
        else if (strchr(dirchars, tolower(keyin)) != NULL)
        {
            dir_chosen = true;
            dir = (int)(strchr(dirchars, tolower(keyin)) - dirchars) / 2;
            shifted_direction = true;

Replacement in crawl-ref/source/direct.cc at line 459 [7.3697945]

B:BD[7.3707400] → [7.3707400:3707449]

            if (strchr(dirchars, keyin) != NULL)

[7.3707400]

[7.3707449]

            // handle non-directional keys
            switch (keyin)

Deletion in crawl-ref/source/direct.cc at line 462 [7.3697945]

B:BD[7.3707463] → [7.3707463:3707707]

                dirChosen = true;
                dir = (int)(strchr(dirchars, keyin) - dirchars) / 2;
            }
            else
            {
                // handle non-directional keys
                switch (keyin)
                {

Replacement in crawl-ref/source/direct.cc at line 463 [7.3697945]

B:BD[8.976698] → [10.537:942]

B:BD[10.942] → [4.160:240]

∅:D[4.240] → [10.1020:1219]

B:BD[10.1020] → [10.1020:1219]

                    case 'C':
                        targChosen = true;
                        mx = you.x_pos + cx - VIEW_CX;
                        my = you.y_pos + cy - VIEW_CY;
                        if (!in_bounds(mx, my))
                            break;
                        if (mgrd[mx][my] != NON_MONSTER)
                        {
                            mprf("%s won't like that.",
                                 ptr_monam(&menv[mgrd[mx][my]], DESC_CAP_THE));
                            break;
                        }
                        create_spec_monster_name(mx, my);
                        viewwindow(true, false);
                        break;

[8.976698]

[10.1219]

            case 'C':
                targ_chosen = true;
                mx = you.x_pos + cx - VIEW_CX;
                my = you.y_pos + cy - VIEW_CY;
                if (!in_bounds(mx, my))
                    break;
                if (mgrd[mx][my] != NON_MONSTER)
                {
                    mprf("%s won't like that.",
                         ptr_monam(&menv[mgrd[mx][my]], DESC_CAP_THE));
                    break;
                }
                create_spec_monster_name(mx, my);
                viewwindow(true, false);
                break;

Replacement in crawl-ref/source/direct.cc at line 479 [7.3697945]

B:BD[10.1244] → [10.1244:1554]

                    case 'D':
                        targChosen = true;
                        mx = you.x_pos + cx - VIEW_CX;
                        my = you.y_pos + cy - VIEW_CY;
                        if (!in_bounds(mx, my))
                            break;
                        mid = mgrd[mx][my];

[10.1244]

[10.1554]

            case 'D':
                targ_chosen = true;
                mx = you.x_pos + cx - VIEW_CX;
                my = you.y_pos + cy - VIEW_CY;
                if (!in_bounds(mx, my))
                    break;
                mid = mgrd[mx][my];

Replacement in crawl-ref/source/direct.cc at line 487 [7.3697945]

B:BD[10.1555] → [10.1555:1782]

                        if (mid == NON_MONSTER)
                            break;
                        monster_die(&menv[mid], KILL_RESET, 0);
                        viewwindow(true, false);
                        break;

[10.1555]

[10.1782]

                if (mid == NON_MONSTER)
                    break;
                monster_die(&menv[mid], KILL_RESET, 0);
                viewwindow(true, false);
                break;

Replacement in crawl-ref/source/direct.cc at line 493 [7.3697945]

∅:D[10.1807] → [8.976698:977008]

B:BD[8.976698] → [8.976698:977008]

                    case 'F':
                        targChosen = true;
                        mx = you.x_pos + cx - VIEW_CX;
                        my = you.y_pos + cy - VIEW_CY;
                        if (!in_bounds(mx, my))
                            break;
                        mid = mgrd[mx][my];

[10.1807]

[8.977008]

            case 'F':
                targ_chosen = true;
                mx = you.x_pos + cx - VIEW_CX;
                my = you.y_pos + cy - VIEW_CY;
                if (!in_bounds(mx, my))
                    break;
                mid = mgrd[mx][my];

Replacement in crawl-ref/source/direct.cc at line 501 [7.3697945]

B:BD[8.977009] → [8.977009:977092]

                        if (mid == NON_MONSTER)
                            break;

[8.977009]

[8.977092]

                if (mid == NON_MONSTER)
                    break;

Replacement in crawl-ref/source/direct.cc at line 504 [7.3697945]

B:BD[8.977093] → [8.977093:977417]

                        mprf("Changing attitude of %s\n",
                                ptr_monam(&menv[mid], DESC_PLAIN));
                        menv[mid].attitude =
                            menv[mid].attitude == ATT_HOSTILE?
                                ATT_FRIENDLY
                              : ATT_HOSTILE;

[8.977093]

[8.977417]

                mprf("Changing attitude of %s\n",
                     ptr_monam(&menv[mid], DESC_PLAIN));
                menv[mid].attitude =
                    menv[mid].attitude == ATT_HOSTILE?
                    ATT_FRIENDLY
                    : ATT_HOSTILE;

Replacement in crawl-ref/source/direct.cc at line 511 [7.3697945]

B:BD[8.977418] → [8.977418:977721]

                        describe_monsters( menv[ mid ].type, mid );
                        redraw_screen();
                        mesclr( true );
                        // describe the cell again.
                        describe_cell(view2gridX(cx), view2gridY(cy));
                        break;

[8.977418]

[8.977721]

                describe_monsters( menv[ mid ].type, mid );
                redraw_screen();
                mesclr( true );
                // describe the cell again.
                describe_cell(view2gridX(cx), view2gridY(cy));
                break;

Replacement in crawl-ref/source/direct.cc at line 519 [7.3697945]

∅:D[8.977729] → [7.3707707:3707806]

B:BD[7.3707707] → [7.3707707:3707806]

                    case CONTROL('F'):
                        mode = (mode + 1) % TARG_NUM_MODES;

[8.977729]

[7.3707806]

            case CONTROL('F'):
                mode = (mode + 1) % TARG_NUM_MODES;

Replacement in crawl-ref/source/direct.cc at line 522 [7.3697945]

B:BD[7.3707831] → [7.3707831:3708114]

                        snprintf( info, INFO_SIZE, "Targeting mode is now: %s",
                                  (mode == TARG_ANY)   ? "any" :
                                  (mode == TARG_ENEMY) ? "enemies" 
                                                       : "friends" );

[7.3707831]

[7.3708114]

            snprintf( info, INFO_SIZE, "Targeting mode is now: %s",
                      (mode == TARG_ANY)   ? "any" :
                      (mode == TARG_ENEMY) ? "enemies" 
                      : "friends" );

Replacement in crawl-ref/source/direct.cc at line 527 [7.3697945]

B:BD[7.3708115] → [7.3708115:3708226]

                        mpr( info );
                        targChosen = true;
                        break;

[7.3708115]

[7.3708226]

            mpr( info );
            targ_chosen = true;
            break;

Replacement in crawl-ref/source/direct.cc at line 531 [7.3697945]

B:BD[7.3708227] → [9.453863:454323]

∅:D[9.454323] → [7.3708432:3708458]

B:BD[7.3708432] → [7.3708432:3708458]

B:BD[7.3708458] → [9.454324:454428]

∅:D[9.454428] → [7.3708564:3708590]

B:BD[7.3708564] → [7.3708564:3708590]

B:BD[7.3708590] → [9.454429:454526]

∅:D[9.454526] → [7.3708590:3708664]

B:BD[7.3708590] → [7.3708590:3708664]

B:BD[7.3708664] → [9.454527:454696]

B:BD[9.454696] → [11.1325:1397]

∅:D[11.1397] → [9.454772:455094]

B:BD[9.454772] → [9.454772:455094]

                    case '^':
                    case '\t':
                    case '\\':
                    case '_':
                    case '<':
                    case '>':
                    {
                        if (find_square( cx, cy, objfind_pos, 1,
                                     find_feature, keyin, true,
                                     Options.target_los_first
                                        ? LOS_FLIPVH : LOS_ANY))
                        {
                            newcx = objfind_pos[0];
                            newcy = objfind_pos[1];
                        }
                        else
                            flush_input_buffer( FLUSH_ON_FAILURE );
                        targChosen = true;
                        break;
                    }
                    case ';':
                    case '/':
                    case '\'':
                    case '*':
                        {
                            dir = keyin == ';' || keyin == '/'? -1 : 1;
                            if (find_square( cx, cy, objfind_pos, dir,
                                     find_object, 0, true,
                                     Options.target_los_first
                                        ? (dir == 1? LOS_FLIPVH : LOS_FLIPHV)
                                        : LOS_ANY))

[7.3708227]

[7.3708664]

            case '^':
            case '\t':
            case '\\':
            case '_':
            case '<':
            case '>':
            {
                if (find_square( cx, cy, objfind_pos, 1,
                                 find_feature, keyin, true,
                                 Options.target_los_first
                                 ? LOS_FLIPVH : LOS_ANY))
                {
                    newcx = objfind_pos[0];
                    newcy = objfind_pos[1];
                }
                else
                    flush_input_buffer( FLUSH_ON_FAILURE );
                targ_chosen = true;
                break;
            }
            case ';':
            case '/':
            case '\'':
            case '*':
            {
                dir = keyin == ';' || keyin == '/'? -1 : 1;
                if (find_square( cx, cy, objfind_pos, dir,
                                 find_object, 0, true,
                                 Options.target_los_first
                                 ? (dir == 1? LOS_FLIPVH : LOS_FLIPHV)
                                 : LOS_ANY))

Replacement in crawl-ref/source/direct.cc at line 563 [7.3697945]

B:BD[7.3708665] → [9.455095:455480]

                            {
                                newcx = objfind_pos[0];
                                newcy = objfind_pos[1];
                            }
                            else
                                flush_input_buffer( FLUSH_ON_FAILURE );
                            targChosen = true;
                            break;
                        }

[7.3708665]

[9.455480]

                {
                    newcx = objfind_pos[0];
                    newcy = objfind_pos[1];
                }
                else
                    flush_input_buffer( FLUSH_ON_FAILURE );
                targ_chosen = true;
                break;
            }

Replacement in crawl-ref/source/direct.cc at line 573 [7.3697945]

B:BD[9.455481] → [9.455481:455511]

∅:D[9.455511] → [7.3708665:3708725]

B:BD[7.3708665] → [7.3708665:3708725]

B:BD[7.3708899] → [7.3708899:3708925]

B:BD[7.3708925] → [11.1398:1454]

∅:D[11.1454] → [9.455572:456086]

B:BD[9.455572] → [9.455572:456086]

∅:D[9.456086] → [7.3709031:3709057]

B:BD[7.3709031] → [7.3709031:3709057]

                    case '-':
                    case '+':
                    case '=':
                        {
                            dir = keyin == '-'? -1 : 1;
                            if (find_square( cx, cy, monsfind_pos, dir, 
                                     find_monster, mode, Options.target_wrap ))
                            {
                                newcx = monsfind_pos[0];
                                newcy = monsfind_pos[1];
                            }
                            else
                                flush_input_buffer( FLUSH_ON_FAILURE );
                            targChosen = true;
                            break;
                        }

[9.455481]

[7.3709131]

            case '-':
            case '+':
            case '=':
            {
                dir = keyin == '-'? -1 : 1;
                if (find_square( cx, cy, monsfind_pos, dir, 
                                 find_monster, mode, Options.target_wrap ))
                {
                    newcx = monsfind_pos[0];
                    newcy = monsfind_pos[1];
                }
                else
                    flush_input_buffer( FLUSH_ON_FAILURE );
                targ_chosen = true;
                break;
            }

Replacement in crawl-ref/source/direct.cc at line 590 [7.3697945]

B:BD[7.3709132] → [7.3709132:3709271]

                    case 't':
                    case 'p':
                        moves.prev_target = -1;
                        break;

[7.3709132]

[7.3709271]

            case 't':
            case 'p':
                moves.prev_target = -1;
                break;

Replacement in crawl-ref/source/direct.cc at line 595 [7.3697945]

B:BD[7.3709272] → [7.3709272:3709345]

B:BD[7.3709345] → [8.977730:977923]

∅:D[8.977923] → [7.3709444:3709488]

B:BD[7.3709444] → [7.3709444:3709488]

                    case '?':
                        targChosen = true;
                        mx = you.x_pos + cx - VIEW_CX;
                        my = you.y_pos + cy - VIEW_CY;
                        if (!in_bounds(mx, my))
                            break;
                        mid = mgrd[mx][my];

[7.3709272]

[7.3709488]

            case '?':
                targ_chosen = true;
                mx = you.x_pos + cx - VIEW_CX;
                my = you.y_pos + cy - VIEW_CY;
                if (!in_bounds(mx, my))
                    break;
                mid = mgrd[mx][my];

Replacement in crawl-ref/source/direct.cc at line 603 [7.3697945]

B:BD[7.3709489] → [7.3709489:3709572]

                        if (mid == NON_MONSTER)
                            break;

[7.3709489]

[7.3709572]

                if (mid == NON_MONSTER)
                    break;

Replacement in crawl-ref/source/direct.cc at line 607 [7.3697945]

B:BD[7.3709598] → [7.3709598:3709700]

                        if (!player_monster_visible( &menv[mid] ))
                            break;

[7.3709598]

[7.3709700]

                if (!player_monster_visible( &menv[mid] ))
                    break;

Replacement in crawl-ref/source/direct.cc at line 611 [7.3697945]

B:BD[7.3709708] → [7.3709708:3709909]

B:BD[7.3709909] → [8.977924:977995]

∅:D[8.977995] → [7.3709989:3710020]

B:BD[7.3709989] → [7.3709989:3710020]

                        describe_monsters( menv[ mid ].type, mid );
                        redraw_screen();
                        mesclr( true );
                        // describe the cell again.
                        describe_cell(view2gridX(cx), view2gridY(cy));
                        break;

[7.3709708]

[7.3710020]

                describe_monsters( menv[ mid ].type, mid );
                redraw_screen();
                mesclr( true );
                // describe the cell again.
                describe_cell(view2gridX(cx), view2gridY(cy));
                break;

Replacement in crawl-ref/source/direct.cc at line 618 [7.3697945]

B:BD[7.3710021] → [7.3710021:3710083]

B:BD[7.3710143] → [7.3710143:3710173]

B:BD[7.3710173] → [9.456087:456117]

B:BD[9.456117] → [8.977996:978026]

∅:D[8.978026] → [9.456117:456340]

B:BD[9.456117] → [9.456117:456340]

B:BD[9.456340] → [8.978027:978102]

                    case '\r':
                    case '\n':
                    case '.':
                    case '5':
                    case 'X':
                        // If we're in look-around mode, and the cursor is on
                        // the character and there's a valid travel target 
                        // within the viewport, jump to that target.
                        if (justLooking && cx == VIEW_CX && cy == VIEW_CY)

[7.3710021]

[9.456404]

            case '\r':
            case '\n':
            case '.':
            case '5':
            case 'X':
                // If we're in look-around mode, and the cursor is on
                // the character and there's a valid travel target 
                // within the viewport, jump to that target.
                if (justLooking && cx == VIEW_CX && cy == VIEW_CY)
                {
                    if (you.travel_x > 0 && you.travel_y > 0)
                    {
                        int nx = grid2viewX(you.travel_x);
                        int ny = grid2viewY(you.travel_y);
                        if (in_viewport_bounds(nx, ny))

Replacement in crawl-ref/source/direct.cc at line 634 [7.3697945]

B:BD[9.456430] → [9.456430:456530]

B:BD[9.456530] → [8.978103:978237]

∅:D[8.978237] → [9.456673:456986]

B:BD[9.456673] → [9.456673:456986]

                            if (you.travel_x > 0 && you.travel_y > 0)
                            {
                                int nx = grid2viewX(you.travel_x);
                                int ny = grid2viewY(you.travel_y);
                                if (in_viewport_bounds(nx, ny))
                                {
                                    newcx = nx;
                                    newcy = ny;
                                    targChosen = true;
                                }
                            }

[9.456430]

[9.456986]

                            newcx = nx;
                            newcy = ny;
                            targ_chosen = true;

Replacement in crawl-ref/source/direct.cc at line 638 [7.3697945]

B:BD[9.457012] → [9.457012:457113]

B:BD[9.457113] → [8.978238:978294]

∅:D[8.978294] → [9.457150:457176]

B:BD[9.457150] → [9.457150:457176]

∅:D[9.457176] → [7.3710248:3710279]

B:BD[7.3710248] → [7.3710248:3710279]

                        else
                        {
                            dirChosen = true;
                            dir = keyin == 'X'? -1 : 4;
                        }
                        break;

[9.457012]

[7.3710279]

                    }
                }
                else
                {
                    dir_chosen = true;
                    dir = keyin == 'X'? -1 : 4;
                }
                break;

Replacement in crawl-ref/source/direct.cc at line 647 [7.3697945]

B:BD[7.3710280] → [9.457177:457207]

∅:D[9.457207] → [7.3710280:3710432]

B:BD[7.3710280] → [7.3710280:3710432]

                    case ' ':
                    case ESCAPE:
                        moves.isCancel = true;
                        mesclr( true );
                        return;

[7.3710280]

[7.3710432]

            case ' ':
            case ESCAPE:
                moves.isCancel = true;
                mesclr( true );
                return;

Replacement in crawl-ref/source/direct.cc at line 653 [7.3697945]

B:BD[7.3710433] → [7.3710433:3710511]

                    default:
                        break;
                }

[7.3710433]

[7.3710511]

            default:
                break;

Replacement in crawl-ref/source/direct.cc at line 660 [7.3697945]
B:BD[7.3710635] → [7.3710635:3710674]
```
        if (!targChosen && !dirChosen)
```
[7.3710635]
[7.3710674]
```
        if (!targ_chosen && !dir_chosen)
```
Replacement in crawl-ref/source/direct.cc at line 664 [7.3697945]
B:BD[7.3710725] → [8.978295:978345]
```
        if (dirChosen && (dir == 4 || dir == -1))
```
[7.3710725]
[7.3710760]
```
        if (dir_chosen && (dir == 4 || dir == -1))
```
Deletion in crawl-ref/source/direct.cc at line 674 [7.3697945]
B:BD[9.457559] → [9.457559:457600]
```
                    // if (!justLooking)
```
Replacement in crawl-ref/source/direct.cc at line 706 [7.3697945]
B:BD[7.3711774] → [7.3711774:3711797]
```
        if (dirChosen)
```
[7.3711774]
[7.3711797]
```
        if (dir_chosen)
```

Replacement in crawl-ref/source/direct.cc at line 708 [7.3697945]

B:BD[7.3711807] → [7.3711807:3711881]

            newcx = cx + xcomp[dir];
            newcy = cy + ycomp[dir];

[7.3711807]

[7.3711881]

            int xi = xcomp[dir], yi = ycomp[dir];
            if (shifted_direction)
            {
                // TODO: Add .crawlrc option for cursor step
                xi *= 3;
                yi *= 3;
            }
            newcx = cx + xi;
            newcy = cy + yi;

Deletion in crawl-ref/source/acr.cc at line 169 [7.4397395]
B:BD[8.1256000] → [8.1256000:1256026]
```
typedef int keycode_type;
```

Deletion in crawl-ref/source/acr.cc at line 2450 [7.4397395]

B:BD[8.1277412] → [8.1277412:1277613]

    }
}
#ifdef UNIX
static keycode_type numpad2vi(keycode_type key)
{
    if (key >= '1' && key <= '9')
    {
        const char *vikeys = "bjnh.lyku";
        return keycode_type(vikeys[key - '1']);

Deletion in crawl-ref/source/acr.cc at line 2451 [7.4397395]
B:BD[8.1277619] → [8.1277619:1277637]
```
    return (key);
```
Deletion in crawl-ref/source/acr.cc at line 2452 [7.4397395]
B:BD[8.1277639] → [8.1277639:1277646]
```
#endif
```
Deletion in crawl-ref/source/acr.cc at line 2455 [7.4397395]
∅:D[5.708] → [8.1277681:1277682]
B:BD[8.1277681] → [8.1277681:1277682]

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

B:BD[8.1277755] → [8.1277755:1279072]

    keyin = getch_with_command_macros();
#ifdef UNIX
    // Kludging running and opening as two character sequences
    // for Unix systems.  This is an easy way out... all the
    // player has to do is find a termcap and numlock setting
    // that will get curses the numbers from the keypad.  This
    // will hopefully be easy.
    /* can we say yuck? -- haranp */
    if (keyin == '*')
    {
        keyin = getch();
        // return control-key
        keyin = CONTROL(toupper(numpad2vi(keyin)));
    }
    else if (keyin == '/')
    {
        keyin = getch();
        // return shift-key
        keyin = toupper(numpad2vi(keyin));
    }
#else
    // Old DOS keypad support
    if (keyin == 0)
    {
        /* FIXME haranp - hackiness */
        const char DOSidiocy[10]     = { "OPQKSMGHI" };
        const char DOSunidiocy[10]   = { "bjnh.lyku" };
        const int DOScontrolidiocy[9] = {
            117, 145, 118, 115, 76, 116, 119, 141, 132
        };
        keyin = getch();
        for (int j = 0; j < 9; ++j ) {
            if (keyin == DOSidiocy[j]) {
                keyin = DOSunidiocy[j];
                break;
            }
            if (keyin == DOScontrolidiocy[j]) {
                keyin = CONTROL(toupper(DOSunidiocy[j]));
                break;
            }
        }
    }
#endif

[8.1277755]

[8.1279072]

    keyin = unmangle_direction_keys(getch_with_command_macros());

Replacement in crawl-ref/source/acr.cc at line 2461 [7.4397395]
B:BD[8.1279087] → [8.1279087:1279105]
```
    return keyin;
```
[8.1279087]
[8.1279105]
```
    return (keyin);
```