diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/cio.cc | 12 | ||||
| -rw-r--r-- | crawl-ref/source/version.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 27 |
3 files changed, 13 insertions, 28 deletions
diff --git a/crawl-ref/source/cio.cc b/crawl-ref/source/cio.cc index b3382bf6fc..e77fc2fe9c 100644 --- a/crawl-ref/source/cio.cc +++ b/crawl-ref/source/cio.cc @@ -22,12 +22,24 @@ extern int unixcurses_get_vi_key(int keyin); static keycode_type _numpad2vi(keycode_type key) { +#ifndef USE_TILE + key = unixcurses_get_vi_key(key); +#endif switch(key) { case CK_UP: key = 'k'; break; case CK_DOWN: key = 'j'; break; case CK_LEFT: key = 'h'; break; case CK_RIGHT: key = 'l'; break; + case 1001: key = 'b'; break; + case 1002: key = 'j'; break; + case 1003: key = 'n'; break; + case 1004: key = 'h'; break; + case 1005: key = '.'; break; + case 1006: key = 'l'; break; + case 1007: key = 'y'; break; + case 1008: key = 'k'; break; + case 1009: key = 'u'; break; } if (key >= '1' && key <= '9') { diff --git a/crawl-ref/source/version.h b/crawl-ref/source/version.h index cce06c75c1..ae966afc3a 100644 --- a/crawl-ref/source/version.h +++ b/crawl-ref/source/version.h @@ -32,7 +32,7 @@ #define CRAWL "Dungeon Crawl Stone Soup" -#define VER_NUM "0.5" +#define VER_NUM "0.5.1" #define VER_QUAL "" // Undefine for official releases. diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 171141a3c8..b6e4b4b4ed 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -3937,33 +3937,6 @@ bool magic_mapping(int map_radius, int proportion, bool suppress_msg, if (is_terrain_changed(*ri)) clear_envmap_grid(*ri); -#if 0 -#ifdef USE_TILE - if (!wizard_map && is_terrain_known(*ri) && !is_terrain_mapped(*ri)) - { - // Can't use set_envmap_obj because that would - // overwrite the gmap. - if (is_terrain_seen(*ri)) - { - env.tile_bk_bg(*ri) = tile_idx_unseen_terrain(ri->x, ri->y, - grd(*ri)); - } - else - { - unsigned int feature = grd(*ri); - unsigned int grid_symbol; - unsigned short grid_color; - get_item_symbol(feature, &grid_symbol, &grid_color); - - unsigned int fg; - unsigned int bg; - tileidx_unseen(fg, bg, grid_symbol, *ri); - env.tile_bk_bg(*ri) = bg; - } - } -#endif -#endif - if (!wizard_map && (is_terrain_seen(*ri) || is_terrain_mapped(*ri))) continue; |