fiddlerwoaroof/crawl - Change HGS5GTCAG44YKSIWZMGIJOOA23AICG4FYQYV2QJCMD4QBP7WJWXAC

[2029802] Fixing numpad issues for tiles. Theoretically, this change should remove the need for getch() vs. getch_ck() by handling key translation through macro context.

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

Created by ennewalker on July 28, 2008

HGS5GTCAG44YKSIWZMGIJOOA23AICG4FYQYV2QJCMD4QBP7WJWXAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/tilesdl.h at line 93 [3.15441]
B:BD[3.17314] → [3.17314:17331]
```
    int getch();
```
Insertion in crawl-ref/source/tilesdl.cc at line 369 [3.19415]
[3.28024]
[3.28024]
```
    case SDLK_KP5:
        return '5';
    case SDLK_KP8:
```
Insertion in crawl-ref/source/tilesdl.cc at line 375 [3.19415]
[3.28073]
[3.28073]
```
    case SDLK_KP2:
```
Insertion in crawl-ref/source/tilesdl.cc at line 378 [3.19415]
[3.28126]
[3.28126]
```
    case SDLK_KP4:
```
Insertion in crawl-ref/source/tilesdl.cc at line 381 [3.19415]
[3.28179]
[3.28179]
```
    case SDLK_KP6:
```
Insertion in crawl-ref/source/tilesdl.cc at line 384 [3.19415]
[3.28234]
[3.28234]
```
    case SDLK_KP0:
```
Insertion in crawl-ref/source/tilesdl.cc at line 387 [3.19415]
[3.28291]
[3.28291]
```
    case SDLK_KP7:
```
Insertion in crawl-ref/source/tilesdl.cc at line 390 [3.19415]
[3.28344]
[3.28344]
```
    case SDLK_KP1:
```
Insertion in crawl-ref/source/tilesdl.cc at line 395 [3.19415]
[3.28450]
[3.28450]
```
    case SDLK_KP9:
```
Insertion in crawl-ref/source/tilesdl.cc at line 398 [3.19415]
[3.28505]
[3.28505]
```
    case SDLK_KP3:
```

Deletion in crawl-ref/source/tilesdl.cc at line 409 [3.19415]

B:BD[3.28703] → [3.28703:28836]

int TilesFramework::getch()
{
    // TODO enne - is there really a difference between these two functions??
    return getch_ck();
}

Replacement in crawl-ref/source/libgui.cc at line 313 [4.5793336]
B:BD[4.5844424] → [3.168236:168248]
```
int getch()
```
[4.5844424]
[3.168248]
```
int getch_ck()
```
Replacement in crawl-ref/source/libgui.cc at line 315 [4.5793336]
B:BD[3.168250] → [3.168250:168278]
```
    return (tiles.getch());
```
[3.168250]
[4.5844511]
```
    return (tiles.getch_ck());
```
Replacement in crawl-ref/source/libgui.cc at line 318 [4.5793336]
B:BD[4.5844514] → [3.168279:168294]
```
int getch_ck()
```
[4.5844514]
[4.5844542]
```
int getch()
```
Replacement in crawl-ref/source/libgui.cc at line 320 [4.5793336]
B:BD[4.5844544] → [3.168295:168326]
```
    return (tiles.getch_ck());
```
[4.5844544]
[4.5844569]
```
    return getch_ck();
```

Insertion in crawl-ref/source/cmd-keys.h at line 12 [2.20639]

[2.20885]

{CK_END, CMD_MOVE_DOWN_LEFT},
{CK_LEFT, CMD_MOVE_LEFT},
{CK_DOWN, CMD_MOVE_DOWN},
{CK_UP, CMD_MOVE_UP},
{CK_RIGHT, CMD_MOVE_RIGHT},
{CK_PGDN, CMD_MOVE_DOWN_RIGHT},
{CK_PGUP, CMD_MOVE_UP_RIGHT},
{CK_HOME, CMD_MOVE_UP_LEFT},

Insertion in crawl-ref/source/cmd-keys.h at line 46 [2.20639]

[2.21439]

{CK_SHIFT_END, CMD_RUN_DOWN_LEFT},
{CK_SHIFT_LEFT, CMD_RUN_LEFT},
{CK_SHIFT_DOWN, CMD_RUN_DOWN},
{CK_SHIFT_UP, CMD_RUN_UP},
{CK_SHIFT_RIGHT, CMD_RUN_RIGHT},
{CK_SHIFT_PGDN, CMD_RUN_DOWN_RIGHT},
{CK_SHIFT_PGUP, CMD_RUN_UP_RIGHT},
{CK_SHIFT_HOME, CMD_RUN_UP_LEFT},

Insertion in crawl-ref/source/cmd-keys.h at line 101 [2.20639]
[2.22656]
[2.22656]
```
{CK_INSERT, CMD_REPEAT_CMD},
```

Insertion in crawl-ref/source/cmd-keys.h at line 165 [2.20639]

[2.24763]

{CK_END, CMD_TARGET_DOWN_LEFT},
{CK_LEFT, CMD_TARGET_LEFT},
{CK_DOWN, CMD_TARGET_DOWN},
{CK_UP, CMD_TARGET_UP},
{CK_RIGHT, CMD_TARGET_RIGHT},
{CK_PGDN, CMD_TARGET_DOWN_RIGHT},
{CK_PGUP, CMD_TARGET_UP_RIGHT},
{CK_HOME, CMD_TARGET_UP_LEFT},

Insertion in crawl-ref/source/cmd-keys.h at line 181 [2.20639]

[2.25004]

{CK_SHIFT_END, CMD_TARGET_DIR_DOWN_LEFT},
{CK_SHIFT_LEFT, CMD_TARGET_DIR_LEFT},
{CK_SHIFT_DOWN, CMD_TARGET_DIR_DOWN},
{CK_SHIFT_UP, CMD_TARGET_DIR_UP},
{CK_SHIFT_RIGHT, CMD_TARGET_DIR_RIGHT},
{CK_SHIFT_PGDN, CMD_TARGET_DIR_DOWN_RIGHT},
{CK_SHIFT_PGUP, CMD_TARGET_DIR_UP_RIGHT},
{CK_SHIFT_HOME, CMD_TARGET_DIR_UP_LEFT},

Deletion in crawl-ref/source/cmd-keys.h at line 192 [2.20639]
B:BD[2.25074] → [2.25074:25075]
Deletion in crawl-ref/source/cio.h at line 197 [5.10469]
B:BD[4.5936407] → [4.5936407:5936449]
```
    CK_MOUSE_B1ITEM,
    CK_MOUSE_B2ITEM,
```

[2029802] Fixing numpad issues for tiles. Theoretically, this change should remove the need for getch() vs. getch_ck() by handling key translation through macro context.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/tilesdl.h at line 93 [3.15441]

Insertion in crawl-ref/source/tilesdl.cc at line 369 [3.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 375 [3.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 378 [3.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 381 [3.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 384 [3.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 387 [3.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 390 [3.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 395 [3.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 398 [3.19415]

Deletion in crawl-ref/source/tilesdl.cc at line 409 [3.19415]

Replacement in crawl-ref/source/libgui.cc at line 313 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 315 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 318 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 320 [4.5793336]

Insertion in crawl-ref/source/cmd-keys.h at line 12 [2.20639]

Insertion in crawl-ref/source/cmd-keys.h at line 46 [2.20639]

Insertion in crawl-ref/source/cmd-keys.h at line 101 [2.20639]

Insertion in crawl-ref/source/cmd-keys.h at line 165 [2.20639]

Insertion in crawl-ref/source/cmd-keys.h at line 181 [2.20639]

Deletion in crawl-ref/source/cmd-keys.h at line 192 [2.20639]

Deletion in crawl-ref/source/cio.h at line 197 [5.10469]