fiddlerwoaroof/crawl - Change DNAZ35MX7CF3D53NHBU4YOL4UI5CT3VECTI3WRXXOAODXEXDAMWQC

[2458672] Fixing level map not using CMD_MAP_* commands or going through cmd-keys.h. This will allow these commands to be remapped correctly.

Also, fixing issue where cancelling the level map help screen in tiles wouldn't go back to viewing the dungeon.

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

Created by ennewalker on December 24, 2008

DNAZ35MX7CF3D53NHBU4YOL4UI5CT3VECTI3WRXXOAODXEXDAMWQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 3340 [7.16817]
∅:D[5.301] → [6.24:43]
B:BD[8.955] → [6.24:43]
```
    int getty = 0;
```
Replacement in crawl-ref/source/view.cc at line 3406 [7.16817]
∅:D[3.4587] → [8.3060:3133]
∅:D[9.6280] → [8.3060:3133]
B:BD[8.3060] → [8.3060:3133]
```
    int search_feat = 0, search_found = 0, anchor_x = -1, anchor_y = -1;
```
[3.4587]
[8.3133]
```
    int search_found = 0, anchor_x = -1, anchor_y = -1;
```

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

∅:D[6.73] → [9.6281:6410]

B:BD[8.3743] → [9.6281:6410]

B:BD[9.6410] → [10.2798:2814]

B:BD[10.2814] → [11.317:440]

∅:D[11.440] → [10.2908:2915]

B:BD[10.2908] → [10.2908:2915]

        getty = unmangle_direction_keys(getchm(KC_LEVELMAP), KC_LEVELMAP,
                                        false, false);
#ifdef USE_TILE
        if (getty == CK_MOUSE_B4)
            getty = '-';
        else if (getty == CK_MOUSE_B5)
            getty = '+';
#endif

[6.73]

[10.2915]

        int key = unmangle_direction_keys(getchm(KC_LEVELMAP), KC_LEVELMAP,
                                          false, false);
        command_type cmd = key_to_command(key, KC_LEVELMAP);
        if (cmd < CMD_MIN_OVERMAP || cmd > CMD_MAX_OVERMAP)
            cmd = CMD_NO_CMD;
        if (key == CK_MOUSE_CLICK)
        {
            const c_mouse_event cme = get_mouse_event();
            const coord_def curp(start_x + curs_x - 1, start_y + curs_y - 1);
            const coord_def grdp =
                cme.pos + coord_def(start_x - 1, start_y - top);
            if (cme.left_clicked() && in_bounds(grdp))
            {
                spec_place = grdp;
                map_alive     = false;
            }
            else if (cme.scroll_up())
                scroll_y = -block_step;
            else if (cme.scroll_down())
                scroll_y = block_step;
            else if (cme.right_clicked())
            {
                const coord_def delta = grdp - curp;
                move_y = delta.y;
                move_x = delta.x;
            }
        }

Replacement in crawl-ref/source/view.cc at line 3487 [7.16817]
B:BD[8.4174] → [8.4174:4197]
```
        switch (getty)
```
[8.4174]
[12.24283]
```
        switch (cmd)
```
Replacement in crawl-ref/source/view.cc at line 3489 [7.16817]
B:BD[12.24293] → [8.4198:4216]
```
        case '?':
```
[12.24293]
[8.4216]
```
        case CMD_MAP_HELP:
```
Replacement in crawl-ref/source/view.cc at line 3493 [7.16817]
B:BD[12.24482] → [8.4270:4297]
```
        case CONTROL('C'):
```
[12.24482]
[8.4297]
```
        case CMD_MAP_CLEAR_MAP:
```
Replacement in crawl-ref/source/view.cc at line 3497 [7.16817]
B:BD[8.4342] → [8.4342:4369]
```
        case CONTROL('F'):
```
[8.4342]
[13.7]
```
        case CMD_MAP_FORGET:
```
Replacement in crawl-ref/source/view.cc at line 3501 [7.16817]
∅:D[13.74] → [8.4369:4396]
∅:D[14.681] → [8.4369:4396]
B:BD[8.4369] → [8.4369:4396]
```
        case CONTROL('W'):
```
[14.681]
[15.6]
```
        case CMD_MAP_ADD_WAYPOINT:
```
Replacement in crawl-ref/source/view.cc at line 3513 [7.16817]
B:BD[16.566] → [4.22:40]
```
        case 'e':
```
[16.566]
[16.584]
```
        case CMD_MAP_EXCLUDE_AREA:
```
Replacement in crawl-ref/source/view.cc at line 3525 [7.16817]
∅:D[6.106] → [8.4647:4674]
∅:D[16.810] → [8.4647:4674]
B:BD[8.4647] → [8.4647:4674]
```
        case CONTROL('E'):
```
[6.106]
[4.94]
```
        case CMD_MAP_CLEAR_EXCLUDES:
```
Replacement in crawl-ref/source/view.cc at line 3530 [7.16817]
∅:D[5.303] → [8.5298:5334]
B:BD[8.5298] → [8.5298:5334]
```
        case 'b':
        case '1':
```
[5.303]
[8.5334]
```
        case CMD_MAP_MOVE_DOWN_LEFT:
```
Replacement in crawl-ref/source/view.cc at line 3535 [7.16817]
B:BD[8.5403] → [8.5403:5439]
```
        case 'j':
        case '2':
```
[8.5403]
[8.5439]
```
        case CMD_MAP_MOVE_DOWN:
```
Replacement in crawl-ref/source/view.cc at line 3540 [7.16817]
B:BD[12.24753] → [8.5507:5543]
```
        case 'u':
        case '9':
```
[12.24753]
[8.5543]
```
        case CMD_MAP_MOVE_UP_RIGHT:
```
Replacement in crawl-ref/source/view.cc at line 3545 [7.16817]
B:BD[8.5612] → [8.5612:5648]
```
        case 'k':
        case '8':
```
[8.5612]
[8.5648]
```
        case CMD_MAP_MOVE_UP:
```
Replacement in crawl-ref/source/view.cc at line 3550 [7.16817]
B:BD[7.75455] → [8.5717:5753]
```
        case 'y':
        case '7':
```
[7.75455]
[8.5753]
```
        case CMD_MAP_MOVE_UP_LEFT:
```
Replacement in crawl-ref/source/view.cc at line 3555 [7.16817]
B:BD[7.75539] → [8.5823:5859]
```
        case 'h':
        case '4':
```
[7.75539]
[8.5859]
```
        case CMD_MAP_MOVE_LEFT:
```
Replacement in crawl-ref/source/view.cc at line 3560 [7.16817]
B:BD[7.75624] → [8.5928:5964]
```
        case 'n':
        case '3':
```
[7.75624]
[8.5964]
```
        case CMD_MAP_MOVE_DOWN_RIGHT:
```
Replacement in crawl-ref/source/view.cc at line 3565 [7.16817]
B:BD[7.75709] → [8.6032:6068]
```
        case 'l':
        case '6':
```
[7.75709]
[8.6068]
```
        case CMD_MAP_MOVE_RIGHT:
```
Replacement in crawl-ref/source/view.cc at line 3570 [7.16817]
B:BD[7.75795] → [8.6136:6154]
```
        case 'B':
```
[7.75795]
[8.6154]
```
        case CMD_MAP_JUMP_DOWN_LEFT:
```
Replacement in crawl-ref/source/view.cc at line 3575 [7.16817]
B:BD[7.75880] → [8.6241:6259]
```
        case 'J':
```
[7.75880]
[8.6259]
```
        case CMD_MAP_JUMP_DOWN:
```
Replacement in crawl-ref/source/view.cc at line 3580 [7.16817]
B:BD[7.75964] → [8.6336:6354]
```
        case 'U':
```
[7.75964]
[8.6354]
```
        case CMD_MAP_JUMP_UP_RIGHT:
```
Replacement in crawl-ref/source/view.cc at line 3585 [7.16817]
B:BD[7.76670] → [8.6441:6459]
```
        case 'K':
```
[7.76670]
[8.6459]
```
        case CMD_MAP_JUMP_UP:
```
Replacement in crawl-ref/source/view.cc at line 3590 [7.16817]
B:BD[7.76743] → [8.6537:6555]
```
        case 'Y':
```
[7.76743]
[8.6555]
```
        case CMD_MAP_JUMP_UP_LEFT:
```
Replacement in crawl-ref/source/view.cc at line 3595 [7.16817]
B:BD[7.76814] → [8.6643:6661]
```
        case 'H':
```
[7.76814]
[8.6661]
```
        case CMD_MAP_JUMP_LEFT:
```
Replacement in crawl-ref/source/view.cc at line 3600 [7.16817]
B:BD[7.76887] → [8.6739:6757]
```
        case 'N':
```
[7.76887]
[8.6757]
```
        case CMD_MAP_JUMP_DOWN_RIGHT:
```
Replacement in crawl-ref/source/view.cc at line 3605 [7.16817]
B:BD[7.76959] → [8.6843:6861]
```
        case 'L':
```
[7.76959]
[8.6861]
```
        case CMD_MAP_JUMP_RIGHT:
```
Replacement in crawl-ref/source/view.cc at line 3610 [7.16817]
B:BD[7.77033] → [8.6938:6956]
```
        case '+':
```
[7.77033]
[8.6956]
```
        case CMD_MAP_SCROLL_DOWN:
```
Replacement in crawl-ref/source/view.cc at line 3616 [7.16817]
∅:D[4.126] → [8.7024:7042]
B:BD[8.7024] → [8.7024:7042]
```
        case '-':
```
[4.126]
[8.7042]
```
        case CMD_MAP_SCROLL_UP:
```

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

∅:D[4.128] → [8.7111:7220]

B:BD[8.7111] → [8.7111:7220]

B:BD[8.7220] → [4.129:147]

∅:D[4.147] → [8.7238:7347]

B:BD[8.7238] → [8.7238:7347]

        case '<':
        case '>':
        case '@':
        case '\t':
        case '^':
        case '_':
        case 'E':
        case 'F':
        case 'W':
        case 'I':
        case '*':
        case '/':
        case '\'':

[4.128]

[8.7347]

        case CMD_MAP_FIND_YOU:
            move_x = you.pos().x - (start_x + curs_x - 1);
            move_y = you.pos().y - (start_y + curs_y - 1);
            break;
        case CMD_MAP_FIND_UPSTAIR:
        case CMD_MAP_FIND_DOWNSTAIR:
        case CMD_MAP_FIND_PORTAL:
        case CMD_MAP_FIND_TRAP:
        case CMD_MAP_FIND_ALTAR:
        case CMD_MAP_FIND_EXCLUDED:
        case CMD_MAP_FIND_F:
        case CMD_MAP_FIND_WAYPOINT:
        case CMD_MAP_FIND_STASH:
        case CMD_MAP_FIND_STASH_REVERSE:

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

B:BD[8.7357] → [8.7357:7390]

            bool forward = true;

[8.7357]

[7.77104]

            bool forward = (cmd != CMD_MAP_FIND_STASH_REVERSE);

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

B:BD[7.77105] → [8.7391:7470]

∅:D[8.7470] → [7.77176:77177]

B:BD[7.77176] → [7.77176:77177]

B:BD[7.77177] → [2.5:84]

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

[7.77105]

[8.7550]

            int getty;
            switch (cmd)
            {
            case CMD_MAP_FIND_UPSTAIR:
                getty = '<';
                break;
            case CMD_MAP_FIND_DOWNSTAIR:
                getty = '>';
                break;
            case CMD_MAP_FIND_PORTAL:
                getty = '\t';
                break;
            case CMD_MAP_FIND_TRAP:
                getty = '^';
                break;
            case CMD_MAP_FIND_ALTAR:
                getty = '_';
                break;
            case CMD_MAP_FIND_EXCLUDED:
                getty = 'E';
                break;
            case CMD_MAP_FIND_F:
                getty = 'F';
                break;
            case CMD_MAP_FIND_WAYPOINT:
                getty = 'W';
                break;
            default:
            case CMD_MAP_FIND_STASH:
            case CMD_MAP_FIND_STASH_REVERSE:

Insertion in crawl-ref/source/view.cc at line 3671 [7.16817]
[8.7579]
[7.77255]
```
                break;
            }
```

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

B:BD[8.7760] → [8.7760:7774]

B:BD[8.7774] → [17.2519:2571]

∅:D[17.2571] → [8.7814:7900]

B:BD[8.7814] → [8.7814:7900]

            }
            if (search_feat != getty)
            {
                search_feat         = getty;
                search_found        = 0;

Replacement in crawl-ref/source/view.cc at line 3697 [7.16817]
B:BD[6.108] → [6.108:136]
B:BD[6.169] → [6.169:188]
B:BD[6.188] → [14.684:685]
∅:D[14.685] → [6.197:226]
B:BD[6.197] → [6.197:226]
```
        case CK_MOUSE_MOVE:
            break;
        case CK_MOUSE_CLICK:
```
[6.108]
[6.226]
```
        case CMD_MAP_GOTO_TARGET:
```

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

B:BD[6.236] → [6.236:471]

B:BD[6.471] → [14.686:687]

∅:D[14.687] → [6.484:553]

B:BD[6.484] → [6.484:553]

B:BD[6.553] → [18.157:192]

∅:D[18.192] → [6.633:724]

B:BD[6.633] → [6.633:724]

B:BD[6.724] → [5.361:401]

∅:D[5.401] → [6.858:898]

B:BD[6.858] → [6.858:898]

B:BD[6.898] → [5.402:441]

∅:D[5.441] → [6.1116:1337]

B:BD[6.1116] → [6.1116:1337]

∅:D[6.1337] → [8.8565:8656]

B:BD[12.25509] → [8.8565:8656]

∅:D[8.8656] → [12.26288:26298]

∅:D[19.37533] → [12.26288:26298]

B:BD[12.26288] → [12.26288:26298]

            const c_mouse_event cme = get_mouse_event();
            const coord_def curp(start_x + curs_x - 1, start_y + curs_y - 1);
            const coord_def grdp =
                cme.pos + coord_def(start_x - 1, start_y - top);
            if (cme.left_clicked() && in_bounds(grdp))
            {
                spec_place = grdp;
                map_alive     = false;
            }
            else if (cme.scroll_up())
                scroll_y = -block_step;
            else if (cme.scroll_down())
                scroll_y = block_step;
            else if (cme.right_clicked())
            {
                const coord_def delta = grdp - curp;
                move_y = delta.y;
                move_x = delta.x;
            }
            break;
        }
        case '.':
        case '\r':
        case 'S':
        case ',':
        case ';':
        {

Replacement in crawl-ref/source/view.cc at line 3718 [7.16817]
B:BD[20.151] → [20.151:169]
```
        case 'T':
```
[20.151]
[20.169]
```
        case CMD_MAP_WIZARD_TELEPORT:
```
Insertion in crawl-ref/source/view.cc at line 3731 [7.16817]
[20.358]
[8.9154]
```
        case CMD_MAP_EXIT_MAP:
```
Insertion in crawl-ref/source/tilesdl.cc at line 320 [21.19415]
[21.24764]
[21.24764]
```
    m_active_layer = LAYER_NORMAL;
```
Insertion in crawl-ref/source/enum.h at line 582 [7.3287960]
[19.907266]
[19.907266]
```
    CMD_MAP_FIND_STASH_REVERSE,
```
Insertion in crawl-ref/source/enum.h at line 587 [7.3287960]
[20.107410]
[19.907292]
```
    CMD_MAP_HELP,
    CMD_MAP_FORGET,
```
Insertion in crawl-ref/source/cmd-name.h at line 138 [22.12200]
[22.17799]
[22.17799]
```
{CMD_MAP_FIND_STASH_REVERSE, "CMD_MAP_FIND_STASH_REVERSE"},
```
Insertion in crawl-ref/source/cmd-name.h at line 141 [22.12200]
[22.17899]
[22.17899]
```
{CMD_MAP_HELP, "CMD_MAP_HELP"},
{CMD_MAP_FORGET, "CMD_MAP_FORGET"},
```

Insertion in crawl-ref/source/cmd-name.h at line 196 [22.12200]

[23.92754]

[22.20423]

{CMD_TARGET_WIZARD_MAKE_SUMMONED, "CMD_TARGET_WIZARD_MAKE_SUMMONED"},
{CMD_TARGET_WIZARD_POLYMORPH, "CMD_TARGET_WIZARD_POLYMORPH"},

Insertion in crawl-ref/source/cmd-keys.h at line 211 [22.20639]

[22.25175]

[22.25182]


{'?', CMD_MAP_HELP},
{CONTROL('C'), CMD_MAP_CLEAR_MAP},
{CONTROL('F'), CMD_MAP_FORGET},
{CONTROL('W'), CMD_MAP_ADD_WAYPOINT},
{'e', CMD_MAP_EXCLUDE_AREA},
{CONTROL('E'), CMD_MAP_CLEAR_EXCLUDES},
{'b', CMD_MAP_MOVE_DOWN_LEFT},
{'h', CMD_MAP_MOVE_LEFT},
{'j', CMD_MAP_MOVE_DOWN},
{'k', CMD_MAP_MOVE_UP},
{'l', CMD_MAP_MOVE_RIGHT},
{'n', CMD_MAP_MOVE_DOWN_RIGHT},
{'u', CMD_MAP_MOVE_UP_RIGHT},
{'y', CMD_MAP_MOVE_UP_LEFT},
{CK_END, CMD_MAP_MOVE_DOWN_LEFT},
{CK_LEFT, CMD_MAP_MOVE_LEFT},
{CK_DOWN, CMD_MAP_MOVE_DOWN},
{CK_UP, CMD_MAP_MOVE_UP},
{CK_RIGHT, CMD_MAP_MOVE_RIGHT},
{CK_PGDN, CMD_MAP_MOVE_DOWN_RIGHT},
{CK_PGUP, CMD_MAP_MOVE_UP_RIGHT},
{CK_HOME, CMD_MAP_MOVE_UP_LEFT},
{'B', CMD_MAP_JUMP_DOWN_LEFT},
{'H', CMD_MAP_JUMP_LEFT},
{'J', CMD_MAP_JUMP_DOWN},
{'K', CMD_MAP_JUMP_UP},
{'L', CMD_MAP_JUMP_RIGHT},
{'N', CMD_MAP_JUMP_DOWN_RIGHT},
{'U', CMD_MAP_JUMP_UP_RIGHT},
{'Y', CMD_MAP_JUMP_UP_LEFT},
{CK_SHIFT_END, CMD_MAP_JUMP_DOWN_LEFT},
{CK_SHIFT_LEFT, CMD_MAP_JUMP_LEFT},
{CK_SHIFT_DOWN, CMD_MAP_JUMP_DOWN},
{CK_SHIFT_UP, CMD_MAP_JUMP_UP},
{CK_SHIFT_RIGHT, CMD_MAP_JUMP_RIGHT},
{CK_SHIFT_PGDN, CMD_MAP_JUMP_DOWN_RIGHT},
{CK_SHIFT_PGUP, CMD_MAP_JUMP_UP_RIGHT},
{CK_SHIFT_HOME, CMD_MAP_JUMP_UP_LEFT},
{'+', CMD_MAP_SCROLL_DOWN},
{CK_MOUSE_B5, CMD_MAP_SCROLL_DOWN},
{'-', CMD_MAP_SCROLL_UP},
{CK_MOUSE_B4, CMD_MAP_SCROLL_UP},
{'<', CMD_MAP_FIND_UPSTAIR},
{'>', CMD_MAP_FIND_DOWNSTAIR},
{'@', CMD_MAP_FIND_YOU},
{'\t', CMD_MAP_FIND_PORTAL},
{'^', CMD_MAP_FIND_TRAP},
{'_', CMD_MAP_FIND_ALTAR},
{'E', CMD_MAP_FIND_EXCLUDED},
{'F', CMD_MAP_FIND_F},
{'W', CMD_MAP_FIND_WAYPOINT},
{'I', CMD_MAP_FIND_STASH},
{'*', CMD_MAP_FIND_STASH},
{'/', CMD_MAP_FIND_STASH_REVERSE},
{'\'', CMD_MAP_FIND_STASH},
{'.', CMD_MAP_GOTO_TARGET},
{'\r', CMD_MAP_GOTO_TARGET},
{'S', CMD_MAP_GOTO_TARGET},
{',', CMD_MAP_GOTO_TARGET},
{';', CMD_MAP_GOTO_TARGET},
{ESCAPE, CMD_MAP_EXIT_MAP},
#ifdef WIZARD
{'T', CMD_MAP_WIZARD_TELEPORT},
#endif

[2458672] Fixing level map not using CMD_MAP_* commands or going through cmd-keys.h. This will allow these commands to be remapped correctly.

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/view.cc at line 3671 [7.16817]

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

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

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

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

Insertion in crawl-ref/source/view.cc at line 3731 [7.16817]

Insertion in crawl-ref/source/tilesdl.cc at line 320 [21.19415]

Insertion in crawl-ref/source/enum.h at line 582 [7.3287960]

Insertion in crawl-ref/source/enum.h at line 587 [7.3287960]

Insertion in crawl-ref/source/cmd-name.h at line 138 [22.12200]

Insertion in crawl-ref/source/cmd-name.h at line 141 [22.12200]

Insertion in crawl-ref/source/cmd-name.h at line 196 [22.12200]

Insertion in crawl-ref/source/cmd-keys.h at line 211 [22.20639]