fiddlerwoaroof/crawl - Change AJJ6D6JRV6ZAZOAUHYUM2IQG42V6PBALOD4KEMNKSVVAOJXAUCPQC

[1601205] */' now work to jump to stashes in the level-map. ; retains its old

behaviour of travel-to-cursor, which may disconcert folks used to its behaviour when targeting, but I suspect they'll get used to it.

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

Created by dshaligram on November 24, 2006

AJJ6D6JRV6ZAZOAUHYUM2IQG42V6PBALOD4KEMNKSVVAOJXAUCPQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1878 [4.16817]

B:BD[3.19960] → [3.19960:20067]

                         int ignore_count, char *move_x, char *move_y) {
    int firstx = -1, firsty = -1;

[3.19960]

[3.20067]

                         int ignore_count, 
                         char *move_x, char *move_y,
                         bool forward) {
    int firstx = -1, firsty = -1, firstmatch = -1;

Replacement in crawl-ref/source/view.cc at line 1889 [4.16817]

B:BD[3.20283] → [3.20283:20318]

            if (!ignore_count--) {

[3.20283]

[3.20318]

            if (forward? !ignore_count-- : --ignore_count == 1) {

Replacement in crawl-ref/source/view.cc at line 1895 [4.16817]
B:BD[3.20525] → [3.20525:20562]
```
            else if (firstx == -1) {
```
[3.20525]
[3.20562]
```
            else if (!forward || firstx == -1) {
```
Insertion in crawl-ref/source/view.cc at line 1898 [4.16817]
[3.20630]
[3.20630]
```
                firstmatch = matchcount;
```
Replacement in crawl-ref/source/view.cc at line 1907 [4.16817]
B:BD[3.20847] → [3.20847:20865]
```
        return 1;
```
[3.20847]
[3.20865]
```
        return matchcount;
```

Replacement in crawl-ref/source/view.cc at line 1935 [4.16817]

∅:D[3.20888] → [4.70609:70879]

∅:D[2.36219] → [4.70609:70879]

B:BD[4.70609] → [4.70609:70879]

B:BD[4.70879] → [2.36220:36287]

// show_map() now centers the known map along x or y.  This prevents
// the player from getting "artificial" location clues by using the
// map to see how close to the end they are.  They'll need to explore
// to get that.  This function is still a mess, though. -- bwr
void show_map( FixedVector<int, 2> &spec_place, bool travel_mode )

[2.36219]

[4.70928]

static void draw_level_map(
        int start_x, int start_y, int screen_y, bool travel_mode)

Deletion in crawl-ref/source/view.cc at line 1938 [4.16817]
B:BD[4.70930] → [4.70930:70945]
```
    int i, j;
```

Deletion in crawl-ref/source/view.cc at line 1939 [4.16817]

B:BD[4.70968] → [4.70968:71078]

B:BD[4.71078] → [3.20889:21003]

B:BD[3.21003] → [2.36288:36315]

∅:D[2.36315] → [3.21029:21245]

B:BD[3.21029] → [3.21029:21245]

∅:D[3.21245] → [4.71078:71132]

B:BD[4.71078] → [4.71078:71132]


    char move_x = 0;
    char move_y = 0;
    char getty = 0;
#ifdef DOS_TERM
    char buffer[4800];
#endif
    // Vector to track all features we can travel to, in order of distance.
    std::vector<coord_def> features;
    if (travel_mode)
    {
        travel_cache.update();
        find_travel_pos(you.x_pos, you.y_pos, NULL, NULL, &features);
        // Sort features into the order the player is likely to prefer.
        arrange_features(features);
    }
    // buffer2[GYM * GXM * 2] segfaults my box {dlb}

Deletion in crawl-ref/source/view.cc at line 1940 [4.16817]
∅:D[3.21298] → [4.71173:71255]
B:BD[4.71173] → [4.71173:71255]
```
    char min_x = 80, max_x = 0, min_y = 0, max_y = 0;
    bool found_y = false;
```

Deletion in crawl-ref/source/view.cc at line 1941 [4.16817]

B:BD[4.71304] → [4.71304:71921]

B:BD[4.71921] → [3.21299:21357]

∅:D[3.21357] → [4.71921:72817]

B:BD[4.71921] → [4.71921:72817]

B:BD[4.72817] → [3.21358:21431]

    const int half_screen = num_lines / 2 - 1;
    for (j = 0; j < GYM; j++)
    {
        for (i = 0; i < GXM; i++)
        {
            if (env.map[i][j])
            {
                if (!found_y)
                {
                    found_y = true;
                    min_y = j;
                }
                max_y = j;
                if (i < min_x)
                    min_x = i;
                if (i > max_x)
                    max_x = i;
            }
        }
    }
    const int map_lines = max_y - min_y + 1;
    const int start_x = min_x + (max_x - min_x + 1) / 2 - 40; // no x scrolling
    const int block_step = Options.level_map_cursor_step;
    int start_y;                                              // y does scroll
    int screen_y = you.y_pos;
    // if close to top of known map, put min_y on top
    // else if close to bottom of known map, put max_y on bottom.
    //
    // The num_lines comparisons are done to keep things neat, by
    // keeping things at the top of the screen.  By shifting an
    // additional one in the num_lines > map_lines case, we can 
    // keep the top line clear... which makes things look a whole
    // lot better for small maps.
    if (num_lines > map_lines)
        screen_y = min_y + half_screen - 1;
    else if (num_lines == map_lines || screen_y - half_screen < min_y)
        screen_y = min_y + half_screen;
    else if (screen_y + half_screen > max_y)
        screen_y = max_y - half_screen;
    int curs_x = you.x_pos - start_x;
    int curs_y = you.y_pos - screen_y + half_screen;
    int search_feat = 0, search_found = 0, anchor_x = -1, anchor_y = -1;

Deletion in crawl-ref/source/view.cc at line 1942 [4.16817]

B:BD[4.72818] → [4.72818:72977]

#ifdef DOS_TERM
    gettext(1, 1, 80, 25, buffer);
    window(1, 1, 80, 25);
#endif
    clrscr();
    textcolor(DARKGREY);
  put_screen:
    bufcount2 = 0;

Replacement in crawl-ref/source/view.cc at line 1948 [4.16817]

B:BD[4.73053] → [4.73053:73128]

    start_y = screen_y - half_screen;
    for (j = 0; j < num_lines; j++)

[4.73053]

[4.73128]

    for (int j = 0; j < num_lines; j++)

Replacement in crawl-ref/source/view.cc at line 1950 [4.16817]
B:BD[4.73134] → [4.73134:73167]
```
        for (i = 0; i < 80; i++)
```
[4.73134]
[4.73167]
```
        for (int i = 0; i < 80; i++)
```
Deletion in crawl-ref/source/view.cc at line 1967 [4.16817]
B:BD[4.73538] → [4.73538:73539]
Replacement in crawl-ref/source/view.cc at line 2032 [4.16817]
B:BD[4.74287] → [4.74287:74315]
```
    gotoxy(curs_x, curs_y);
```
[4.74287]
[4.74315]
```
}
```

Replacement in crawl-ref/source/view.cc at line 2034 [4.16817]

B:BD[4.74316] → [4.74316:74330]

B:BD[4.74330] → [3.22466:22499]

  gettything:
    getty = getchm(KC_LEVELMAP);

[4.74316]

[4.74351]

// show_map() now centers the known map along x or y.  This prevents
// the player from getting "artificial" location clues by using the
// map to see how close to the end they are.  They'll need to explore
// to get that.  This function is still a mess, though. -- bwr
void show_map( FixedVector<int, 2> &spec_place, bool travel_mode )
{
    int i, j;

Replacement in crawl-ref/source/view.cc at line 2042 [4.16817]

B:BD[4.74352] → [2.37085:37151]

∅:D[2.37151] → [4.74425:74569]

B:BD[4.74425] → [4.74425:74569]

∅:D[5.91] → [4.74582:74726]

B:BD[4.74582] → [4.74582:74726]

B:BD[4.74726] → [3.22500:22614]

    if (travel_mode && getty != 0 && getty != '+' && getty != '-'
        && getty != 'h' && getty != 'j' && getty != 'k' && getty != 'l'
        && getty != 'y' && getty != 'u' && getty != 'b' && getty != 'n'
        && getty != 'H' && getty != 'J' && getty != 'K' && getty != 'L'
        && getty != 'Y' && getty != 'U' && getty != 'B' && getty != 'N'
        // Keystrokes to initiate travel
        && getty != ',' && getty != '.' && getty != '\r' && getty != ';'

[4.74352]

[3.22614]

    char move_x = 0;
    char move_y = 0;
    char getty = 0;

Replacement in crawl-ref/source/view.cc at line 2046 [4.16817]

B:BD[3.22615] → [3.22615:22979]

B:BD[3.22979] → [2.37152:37176]

∅:D[2.37176] → [3.22979:23052]

B:BD[3.22979] → [3.22979:23052]

∅:D[3.23052] → [4.74774:74806]

B:BD[4.74774] → [4.74774:74806]

        // Keystrokes for jumping to features
        && getty != '<' && getty != '>' && getty != '@' && getty != '\t'
        && getty != '^' && getty != '_'
        && (getty < '0' || getty > '9')
        && getty != CONTROL('X')
        && getty != CONTROL('E')
        && getty != CONTROL('F')
        && getty != CONTROL('W')
        && getty != CONTROL('C')
        && getty != '?'
        && getty != 'X' && getty != 'F' && getty != 'I' && getty != 'W')
    {
        goto putty;
    }

[3.22615]

[4.74806]

#ifdef DOS_TERM
    char buffer[4800];
#endif

Replacement in crawl-ref/source/view.cc at line 2050 [4.16817]

B:BD[4.74807] → [2.37177:37244]

∅:D[2.37244] → [4.74880:75024]

B:BD[4.74880] → [4.74880:75024]

∅:D[5.104] → [4.75037:75181]

B:BD[4.75037] → [4.75037:75181]

B:BD[4.75181] → [3.23053:23285]

    if (!travel_mode && getty != 0 && getty != '+' && getty != '-'
        && getty != 'h' && getty != 'j' && getty != 'k' && getty != 'l'
        && getty != 'y' && getty != 'u' && getty != 'b' && getty != 'n'
        && getty != 'H' && getty != 'J' && getty != 'K' && getty != 'L'
        && getty != 'Y' && getty != 'U' && getty != 'B' && getty != 'N'
        && getty != '.' && getty != 'S' && (getty < '0' || getty > '9')
        // Keystrokes for jumping to features
        && getty != '<' && getty != '>' && getty != '@' && getty != '\t'
        && getty != '^' && getty != '_')

[4.74807]

[4.75261]

    // Vector to track all features we can travel to, in order of distance.
    std::vector<coord_def> features;
    if (travel_mode)

Replacement in crawl-ref/source/view.cc at line 2054 [4.16817]
B:BD[4.75267] → [4.75267:75298]
```
        goto gettything;
    }
```
[4.75267]
[4.75298]
```
        travel_cache.update();
```

Replacement in crawl-ref/source/view.cc at line 2056 [4.16817]

B:BD[4.75299] → [4.75299:75319]

B:BD[4.75319] → [2.37245:37251]

∅:D[2.37251] → [3.23286:23323]

B:BD[4.75319] → [3.23286:23323]

B:BD[3.23323] → [2.37252:37335]

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

[4.75299]

[2.37335]

        find_travel_pos(you.x_pos, you.y_pos, NULL, NULL, &features);
        // Sort features into the order the player is likely to prefer.
        arrange_features(features);

Replacement in crawl-ref/source/view.cc at line 2061 [4.16817]

B:BD[3.23324] → [2.37342:37384]

∅:D[2.37384] → [3.23344:23432]

B:BD[3.23344] → [3.23344:23432]

#if defined(WIN32CONSOLE) || defined(DOS)
    // Translate shifted numpad to shifted vi keys. Yes,
    // this is horribly hacky.

[3.23324]

[3.23432]

    char min_x = 80, max_x = 0, min_y = 0, max_y = 0;
    bool found_y = false;
    const int num_lines = get_number_of_lines();
    const int half_screen = num_lines / 2 - 1;
    for (j = 0; j < GYM; j++)

Replacement in crawl-ref/source/view.cc at line 2069 [4.16817]

B:BD[3.23438] → [3.23438:23683]

        static int win_keypad[] = { 'B', 'J', 'N', 
                                    'H', '5', 'L',
                                    'Y', 'K', 'U' };
        if (getty >= '1' && getty <= '9')
            getty = win_keypad[ getty - '1' ];

[3.23438]

[3.23683]

        for (i = 0; i < GXM; i++)
        {
            if (env.map[i][j])
            {
                if (!found_y)
                {
                    found_y = true;
                    min_y = j;
                }
                max_y = j;
                if (i < min_x)
                    min_x = i;
                if (i > max_x)
                    max_x = i;
            }
        }

Insertion in crawl-ref/source/view.cc at line 2089 [4.16817]

[3.23689]


    const int map_lines = max_y - min_y + 1;
    const int start_x = min_x + (max_x - min_x + 1) / 2 - 40; // no x scrolling
    const int block_step = Options.level_map_cursor_step;
    int start_y = 0;                                          // y does scroll
    int screen_y = you.y_pos;
    // if close to top of known map, put min_y on top
    // else if close to bottom of known map, put max_y on bottom.
    //
    // The num_lines comparisons are done to keep things neat, by
    // keeping things at the top of the screen.  By shifting an
    // additional one in the num_lines > map_lines case, we can 
    // keep the top line clear... which makes things look a whole
    // lot better for small maps.
    if (num_lines > map_lines)
        screen_y = min_y + half_screen - 1;
    else if (num_lines == map_lines || screen_y - half_screen < min_y)
        screen_y = min_y + half_screen;
    else if (screen_y + half_screen > max_y)
        screen_y = max_y - half_screen;
    int curs_x = you.x_pos - start_x;
    int curs_y = you.y_pos - screen_y + half_screen;
    int search_feat = 0, search_found = 0, anchor_x = -1, anchor_y = -1;
    bool map_alive  = true;
    bool redraw_map = true;
#ifdef DOS_TERM
    gettext(1, 1, 80, 25, buffer);
    window(1, 1, 80, 25);

Replacement in crawl-ref/source/view.cc at line 2125 [4.16817]
B:BD[4.75345] → [4.75345:75364]
```
    switch (getty)
```
[4.75345]
[4.75364]
```
    clrscr();
    textcolor(DARKGREY);
    while (map_alive)
```

Replacement in crawl-ref/source/view.cc at line 2130 [4.16817]

B:BD[4.75370] → [2.37385:37444]

    case '?':
        show_levelmap_help();
        break;

[4.75370]

[2.37444]

        start_y = screen_y - half_screen;

Replacement in crawl-ref/source/view.cc at line 2132 [4.16817]

∅:D[2.37445] → [3.23697:23756]

B:BD[4.75370] → [3.23697:23756]

    case CONTROL('C'):
        clear_map();
        break;

[2.37445]

[3.23756]

        if (redraw_map)
            draw_level_map(start_x, start_y, screen_y, travel_mode);

Replacement in crawl-ref/source/view.cc at line 2135 [4.16817]

B:BD[3.23757] → [3.23757:24283]

    case CONTROL('F'):
    case CONTROL('W'):
        travel_cache.add_waypoint(start_x + curs_x, start_y + curs_y);
        // We need to do this all over again so that the user can jump
        // to the waypoint he just created.
        features.clear();
        find_travel_pos(you.x_pos, you.y_pos, NULL, NULL, &features);
        // Sort features into the order the player is likely to prefer.
        arrange_features(features);
        move_x = move_y = 0;
        break;
    case CONTROL('E'):
    case CONTROL('X'):

[3.23757]

[3.24283]

        redraw_map = true;
        gotoxy(curs_x, curs_y);
        getty = getchm(KC_LEVELMAP);
        if (getty == 0)
        {
            getty = getchm(KC_LEVELMAP);
            // [dshaligram] DOS madness.
            getty = dos_direction_unmunge(getty);
        }
#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
        switch (getty)

Replacement in crawl-ref/source/view.cc at line 2160 [4.16817]

B:BD[3.24293] → [3.24293:24481]

            int x = start_x + curs_x, y = start_y + curs_y;
            if (getty == CONTROL('X'))
                toggle_exclude(x, y);
            else
                clear_excludes();

[3.24293]

[3.24481]

        case '?':
            show_levelmap_help();
            break;

Replacement in crawl-ref/source/view.cc at line 2164 [4.16817]

B:BD[3.24482] → [3.24482:24532]

            // We now need to redo travel colours

[3.24482]

[3.24532]

        case CONTROL('C'):
            clear_map();
            break;
        case CONTROL('F'):
        case CONTROL('W'):
            travel_cache.add_waypoint(start_x + curs_x, start_y + curs_y);
            // We need to do this all over again so that the user can jump
            // to the waypoint he just created.

Insertion in crawl-ref/source/view.cc at line 2177 [4.16817]

[3.24752]

            move_x = move_y = 0;
            break;
        case CONTROL('E'):
        case CONTROL('X'):
            {
                int x = start_x + curs_x, y = start_y + curs_y;
                if (getty == CONTROL('X'))
                    toggle_exclude(x, y);
                else
                    clear_excludes();
                // We now need to redo travel colours
                features.clear();
                find_travel_pos(you.x_pos, you.y_pos, NULL, NULL, &features);
                // Sort features into the order the player is likely to prefer.
                arrange_features(features);
                move_x = move_y = 0;
            }
            break;
            
        case 'b':
        case '1':
            move_x = -1;
            move_y = 1;
            break;
        case 'j':
        case '2':
            move_y = 1;
            move_x = 0;
            break;

Replacement in crawl-ref/source/view.cc at line 2210 [4.16817]

B:BD[3.24753] → [3.24753:24820]

∅:D[3.24820] → [4.75370:75454]

B:BD[4.75370] → [4.75370:75454]

            move_x = move_y = 0;
        }
        break;
        
    case 'b':
    case '1':
        move_x = -1;
        move_y = 1;
        break;

[3.24753]

[4.75454]

        case 'u':
        case '9':
            move_x = 1;
            move_y = -1;
            break;
        case 'k':
        case '8':
            move_y = -1;
            move_x = 0;
            break;

Replacement in crawl-ref/source/view.cc at line 2222 [4.16817]

B:BD[4.75455] → [4.75455:75538]

    case 'j':
    case '2':
        move_y = 1;
        move_x = 0;
        break;

[4.75455]

[4.75538]

        case 'y':
        case '7':
            move_y = -1;
            move_x = -1;
            break;

Replacement in crawl-ref/source/view.cc at line 2228 [4.16817]

B:BD[4.75539] → [4.75539:75623]

    case 'u':
    case '9':
        move_x = 1;
        move_y = -1;
        break;

[4.75539]

[4.75623]

        case 'h':
        case '4':
            move_x = -1;
            move_y = 0;
            break;

Replacement in crawl-ref/source/view.cc at line 2234 [4.16817]

B:BD[4.75624] → [4.75624:75708]

    case 'k':
    case '8':
        move_y = -1;
        move_x = 0;
        break;

[4.75624]

[4.75708]

        case 'n':
        case '3':
            move_y = 1;
            move_x = 1;
            break;

Replacement in crawl-ref/source/view.cc at line 2240 [4.16817]

B:BD[4.75709] → [4.75709:75794]

    case 'y':
    case '7':
        move_y = -1;
        move_x = -1;
        break;

[4.75709]

[4.75794]

        case 'l':
        case '6':
            move_x = 1;
            move_y = 0;
            break;

Replacement in crawl-ref/source/view.cc at line 2246 [4.16817]

B:BD[4.75795] → [4.75795:75879]

    case 'h':
    case '4':
        move_x = -1;
        move_y = 0;
        break;

[4.75795]

[4.75879]

        case 'B':
            move_x = -block_step;
            move_y = block_step;
            break;

Replacement in crawl-ref/source/view.cc at line 2251 [4.16817]

B:BD[4.75880] → [4.75880:75963]

    case 'n':
    case '3':
        move_y = 1;
        move_x = 1;
        break;

[4.75880]

[4.75963]

        case 'J':
            move_y = block_step;
            move_x = 0;
            break;

Replacement in crawl-ref/source/view.cc at line 2256 [4.16817]

B:BD[4.75964] → [4.75964:76032]

B:BD[4.76647] → [4.76647:76662]

    case 'l':
    case '6':
        move_x = 1;
        move_y = 0;
        break;

[4.75964]

[4.76669]

        case 'U':
            move_x = block_step;
            move_y = -block_step;
            break;

Replacement in crawl-ref/source/view.cc at line 2261 [4.16817]

B:BD[4.76670] → [4.76670:76684]

B:BD[4.76684] → [3.24821:24880]

∅:D[3.24880] → [4.76727:76742]

B:BD[4.76727] → [4.76727:76742]

    case 'B':
        move_x = -block_step;
        move_y = block_step;
        break;

[4.76670]

[4.76742]

        case 'K':
            move_y = -block_step;
            move_x = 0;
            break;

Replacement in crawl-ref/source/view.cc at line 2266 [4.16817]

B:BD[4.76743] → [4.76743:76757]

B:BD[4.76757] → [3.24881:24910]

∅:D[3.24910] → [4.76778:76813]

B:BD[4.76778] → [4.76778:76813]

    case 'J':
        move_y = block_step;
        move_x = 0;
        break;

[4.76743]

[4.76813]

        case 'Y':
            move_y = -block_step;
            move_x = -block_step;
            break;

Replacement in crawl-ref/source/view.cc at line 2271 [4.16817]

B:BD[4.76814] → [4.76814:76828]

B:BD[4.76828] → [3.24911:24970]

∅:D[3.24970] → [4.76871:76886]

B:BD[4.76871] → [4.76871:76886]

    case 'U':
        move_x = block_step;
        move_y = -block_step;
        break;

[4.76814]

[4.76886]

        case 'H':
            move_x = -block_step;
            move_y = 0;
            break;

Replacement in crawl-ref/source/view.cc at line 2276 [4.16817]

B:BD[4.76887] → [4.76887:76901]

B:BD[4.76901] → [3.24971:25001]

∅:D[3.25001] → [4.76923:76958]

B:BD[4.76923] → [4.76923:76958]

    case 'K':
        move_y = -block_step;
        move_x = 0;
        break;

[4.76887]

[4.76958]

        case 'N':
            move_y = block_step;
            move_x = block_step;
            break;

Replacement in crawl-ref/source/view.cc at line 2281 [4.16817]

B:BD[4.76959] → [4.76959:76973]

B:BD[4.76973] → [3.25002:25062]

∅:D[3.25062] → [4.77017:77032]

B:BD[4.77017] → [4.77017:77032]

    case 'Y':
        move_y = -block_step;
        move_x = -block_step;
        break;

[4.76959]

[4.77032]

        case 'L':
            move_x = block_step;
            move_y = 0;
            break;

Replacement in crawl-ref/source/view.cc at line 2286 [4.16817]

B:BD[4.77033] → [4.77033:77047]

B:BD[4.77047] → [3.25063:25093]

∅:D[3.25093] → [4.77069:77104]

B:BD[4.77069] → [4.77069:77104]

    case 'H':
        move_x = -block_step;
        move_y = 0;
        break;

[4.77033]

[4.77104]

        case '+':
            move_y = 20;
            move_x = 0;
            break;
        case '-':
            move_y = -20;
            move_x = 0;
            break;
        case '<':
        case '>':
        case '@':
        case '\t':
        case '^':
        case '_':
        case 'X':
        case 'F':
        case 'W':
        case 'I':
        case '*':
        case '/':
        case '\'':
        {
            bool forward = true;

Replacement in crawl-ref/source/view.cc at line 2310 [4.16817]

B:BD[4.77105] → [4.77105:77119]

B:BD[4.77119] → [3.25094:25152]

∅:D[3.25152] → [4.77161:77176]

B:BD[4.77161] → [4.77161:77176]

    case 'N':
        move_y = block_step;
        move_x = block_step;
        break;

[4.77105]

[4.77176]

            if (getty == '/' || getty == ';')
                forward = false;

Replacement in crawl-ref/source/view.cc at line 2313 [4.16817]

B:BD[4.77177] → [4.77177:77191]

B:BD[4.77191] → [3.25153:25182]

∅:D[3.25182] → [4.77212:77247]

B:BD[4.77212] → [4.77212:77247]

    case 'L':
        move_x = block_step;
        move_y = 0;
        break;

[4.77177]

[4.77255]

            if (getty == '/' || getty == ';' || getty == ';' || getty == '\'')
                getty = 'I';

Replacement in crawl-ref/source/view.cc at line 2316 [4.16817]

B:BD[4.77256] → [4.77256:77382]

B:BD[4.77382] → [3.25183:25499]

    case '+':
        move_y = 20;
        move_x = 0;
        break;
    case '-':
        move_y = -20;
        move_x = 0;
        break;
    case '<':
    case '>':
    case '@':
    case '\t':
    case '^':
    case '_':
    case 'X':
    case 'F':
    case 'W':
    case 'I':
        move_x = 0;
        move_y = 0;
        if (anchor_x == -1) {
            anchor_x = start_x + curs_x - 1;
            anchor_y = start_y + curs_y - 1;

[4.77256]

[3.25499]

            move_x = 0;
            move_y = 0;
            if (anchor_x == -1) {
                anchor_x = start_x + curs_x - 1;
                anchor_y = start_y + curs_y - 1;
            }
            if (search_feat != getty) {
                search_feat         = getty;
                search_found        = 0;
            }
            if (travel_mode)
                search_found = find_feature(features, getty, curs_x, curs_y, 
                                            start_x, start_y,
                                            search_found, 
                                            &move_x, &move_y,
                                            forward);
            else
                search_found = find_feature(getty, curs_x, curs_y,
                                            start_x, start_y,
                                            anchor_x, anchor_y,
                                            search_found, &move_x, &move_y);
            break;

Replacement in crawl-ref/source/view.cc at line 2339 [4.16817]

B:BD[3.25509] → [3.25509:25633]

B:BD[3.25633] → [2.37446:37471]

∅:D[2.37471] → [3.25661:26133]

B:BD[3.25661] → [3.25661:26133]

∅:D[3.26133] → [4.77382:77440]

B:BD[4.77382] → [4.77382:77440]

B:BD[4.77440] → [3.26134:26224]

B:BD[3.26224] → [2.37472:37533]

        if (search_feat != getty) {
            search_feat         = getty;
            search_found        = 0;
        }
        if (travel_mode)
            search_found = find_feature(features, getty, curs_x, curs_y, 
                                        start_x, start_y,
                                        search_found, &move_x, &move_y);
        else
            search_found = find_feature(getty, curs_x, curs_y,
                                        start_x, start_y,
                                        anchor_x, anchor_y,
                                        search_found, &move_x, &move_y);
        break;
    case '.':
    case '\r':
    case 'S':
    case ',':
    case ';':
    {
        int x = start_x + curs_x, y = start_y + curs_y;
        if (travel_mode && x == you.x_pos && y == you.y_pos)

[3.25509]

[3.26288]

        case '.':
        case '\r':
        case 'S':
        case ',':
        case ';':

Replacement in crawl-ref/source/view.cc at line 2345 [4.16817]

B:BD[3.26298] → [3.26298:26440]

            if (you.travel_x > 0 && you.travel_y > 0) {
                move_x = you.travel_x - x;
                move_y = you.travel_y - y;

[3.26298]

[3.26440]

            int x = start_x + curs_x, y = start_y + curs_y;
            if (travel_mode && x == you.x_pos && y == you.y_pos)
            {
                if (you.travel_x > 0 && you.travel_y > 0) {
                    move_x = you.travel_x - x;
                    move_y = you.travel_y - y;
                }
                break;

Replacement in crawl-ref/source/view.cc at line 2354 [4.16817]

B:BD[3.26454] → [3.26454:26473]

            break;

[3.26454]

[3.26473]

            else {
                spec_place[0] = x;
                spec_place[1] = y;
                map_alive = false;
                break;
            }

Replacement in crawl-ref/source/view.cc at line 2361 [4.16817]

B:BD[3.26483] → [3.26483:26584]

        else {
            spec_place[0] = x;
            spec_place[1] = y;
            goto putty;

[3.26483]

[3.26584]

        default:
            move_x = 0;
            move_y = 0;
            if (travel_mode)
            {
                map_alive = false;
                break;
            }
            redraw_map = false;
            continue;

Replacement in crawl-ref/source/view.cc at line 2372 [4.16817]
B:BD[3.26594] → [3.26594:26600]
∅:D[3.26600] → [4.77545:77619]
B:BD[4.77545] → [4.77545:77619]
```
    }
    default:
        move_x = 0;
        move_y = 0;
        break;
    }
```
[3.26594]
[4.77619]
```
        if (!map_alive)
            break;
```

Replacement in crawl-ref/source/view.cc at line 2376 [4.16817]

B:BD[4.77620] → [4.77620:77693]

    if (curs_x + move_x < 1 || curs_x + move_x > 80)
        move_x = 0;

[4.77620]

[4.77693]

        if (curs_x + move_x < 1 || curs_x + move_x > 80)
            move_x = 0;

Replacement in crawl-ref/source/view.cc at line 2379 [4.16817]
B:BD[4.77694] → [4.77694:77716]
```
    curs_x += move_x;
```
[4.77694]
[4.77716]
```
        curs_x += move_x;
```

Replacement in crawl-ref/source/view.cc at line 2381 [4.16817]

B:BD[4.77717] → [4.77717:77907]

    if (num_lines < map_lines)
    {
        // Scrolling only happens when we don't have a large enough 
        // display to show the known map.
        if (getty == '-' || getty == '+')

[4.77717]

[4.77907]

        if (num_lines < map_lines)

Replacement in crawl-ref/source/view.cc at line 2383 [4.16817]

B:BD[4.77917] → [4.77917:77979]

            if (getty == '-')
                screen_y -= 20;

[4.77917]

[4.77979]

            // Scrolling only happens when we don't have a large enough 
            // display to show the known map.
            if (getty == '-' || getty == '+')
            {
                if (getty == '-')
                    screen_y -= 20;

Replacement in crawl-ref/source/view.cc at line 2390 [4.16817]

B:BD[4.77980] → [4.77980:78077]

            if (screen_y <= min_y + half_screen)
                screen_y = min_y + half_screen;

[4.77980]

[4.78077]

                if (screen_y <= min_y + half_screen)
                    screen_y = min_y + half_screen;

Replacement in crawl-ref/source/view.cc at line 2393 [4.16817]

B:BD[4.78078] → [4.78078:78140]

            if (getty == '+')
                screen_y += 20;

[4.78078]

[4.78140]

                if (getty == '+')
                    screen_y += 20;

Replacement in crawl-ref/source/view.cc at line 2396 [4.16817]

B:BD[4.78141] → [4.78141:78238]

            if (screen_y >= max_y - half_screen)
                screen_y = max_y - half_screen;

[4.78141]

[4.78238]

                if (screen_y >= max_y - half_screen)
                    screen_y = max_y - half_screen;

Replacement in crawl-ref/source/view.cc at line 2399 [4.16817]

B:BD[4.78239] → [4.78239:78278]

            goto put_screen;
        }

[4.78239]

[4.78278]

                continue;
            }

Replacement in crawl-ref/source/view.cc at line 2402 [4.16817]

B:BD[4.78279] → [4.78279:78404]

        if (curs_y + move_y < 1)
        {
            // screen_y += (curs_y + move_y) - 1;
            screen_y += move_y;

[4.78279]

[4.78404]

            if (curs_y + move_y < 1)
            {
                // screen_y += (curs_y + move_y) - 1;
                screen_y += move_y;

Replacement in crawl-ref/source/view.cc at line 2407 [4.16817]

B:BD[4.78405] → [3.26601:26712]

∅:D[3.26712] → [4.78453:78501]

B:BD[4.78453] → [4.78453:78501]

            if (screen_y < min_y + half_screen) {
                move_y   = screen_y - (min_y + half_screen);
                screen_y = min_y + half_screen;

[4.78405]

[3.26713]

                if (screen_y < min_y + half_screen) {
                    move_y   = screen_y - (min_y + half_screen);
                    screen_y = min_y + half_screen;
                }
                else
                    move_y = 0;

Deletion in crawl-ref/source/view.cc at line 2414 [4.16817]
B:BD[3.26727] → [3.26727:26772]
∅:D[3.26772] → [4.78526:78536]
B:BD[4.78526] → [4.78526:78536]
```
            else
                move_y = 0;
        }
```

Replacement in crawl-ref/source/view.cc at line 2415 [4.16817]

B:BD[4.78537] → [4.78537:78686]

        if (curs_y + move_y > num_lines - 1)
        {
            // screen_y += (curs_y + move_y) - num_lines + 1;
            screen_y += move_y;

[4.78537]

[4.78686]

            if (curs_y + move_y > num_lines - 1)
            {
                // screen_y += (curs_y + move_y) - num_lines + 1;
                screen_y += move_y;

Replacement in crawl-ref/source/view.cc at line 2420 [4.16817]

B:BD[4.78687] → [3.26773:26884]

∅:D[3.26884] → [4.78736:78784]

B:BD[4.78736] → [4.78736:78784]

            if (screen_y > max_y - half_screen) {
                move_y   = screen_y - (max_y - half_screen);
                screen_y = max_y - half_screen;

[4.78687]

[3.26885]

                if (screen_y > max_y - half_screen) {
                    move_y   = screen_y - (max_y - half_screen);
                    screen_y = max_y - half_screen;
                }
                else
                    move_y = 0;

Deletion in crawl-ref/source/view.cc at line 2427 [4.16817]
B:BD[3.26899] → [3.26899:26944]
```
            else
                move_y = 0;
```
Deletion in crawl-ref/source/view.cc at line 2428 [4.16817]
B:BD[4.78819] → [4.78819:78825]
```
    }
```

Replacement in crawl-ref/source/view.cc at line 2429 [4.16817]

B:BD[4.78826] → [4.78826:78906]

    if (curs_y + move_y < 1 || curs_y + move_y > num_lines)
        move_y = 0;

[4.78826]

[4.78906]

        if (curs_y + move_y < 1 || curs_y + move_y > num_lines)
            move_y = 0;

Replacement in crawl-ref/source/view.cc at line 2432 [4.16817]
B:BD[4.78907] → [4.78907:78950]
```
    curs_y += move_y;
    goto put_screen;
```
[4.78907]
[4.78950]
```
        curs_y += move_y;
    }
```
Deletion in crawl-ref/source/view.cc at line 2435 [4.16817]
B:BD[4.78951] → [4.78951:78961]
```
  putty:
```