nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

(from Yitzhak)

Browse Source 
This is the part of Yitzhak's patch not currently under discussion.
This commit is contained in:
nethack.allison
2002-03-16 18:54:16 +00:00
parent 69ca802bb8
commit 723e17b6ee
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/options.c
View File

@@ -1782,7 +1782,7 @@ goodfruit:
/* WINCAP
* map_mode:[tiles|ascii4x6|ascii6x8|ascii8x8|ascii16x8|ascii7x12|ascii8x12|
ascii15x12|ascii12x16|ascii10x18|fit_to_screen] */
ascii16x12|ascii12x16|ascii10x18|fit_to_screen] */
fullname = "map_mode";
if (match_optname(opts, fullname, sizeof("map_mode")-1, TRUE)) {
op = string_for_opt(opts, negated);
@@ -1801,7 +1801,7 @@ goodfruit:
iflags.wc_map_mode = MAP_MODE_ASCII7x12;
else if (!strncmpi (op, "ascii8x12", sizeof("ascii8x12")-1))
iflags.wc_map_mode = MAP_MODE_ASCII8x12;
else if (!strncmpi (op, "ascii15x12", sizeof("ascii15x12")-1))
else if (!strncmpi (op, "ascii16x12", sizeof("ascii16x12")-1))
iflags.wc_map_mode = MAP_MODE_ASCII16x12;
else if (!strncmpi (op, "ascii12x16", sizeof("ascii12x16")-1))
iflags.wc_map_mode = MAP_MODE_ASCII12x16;

15
sys/winnt/defaults.nh
View File

@@ -58,11 +58,20 @@ OPTIONS=font_text:Courier New,font_size_text:9
OPTIONS=font_status:Courier New,font_size_status:10
# Other
OPTIONS=hilite_pet
OPTIONS=hilite_pet,!toptenwin
#OPTIONS=!splash_screen,player_selection:prompts
# Top Ten Window. Highly Recommended.
#OPTIONS=toptenwin
# Status/message window colors
# Possible color options include:
# six digit hexadecimal RGB color value ("#8F8F8F"), black, red, green, brown,
# blue, magenta, cyan, gray (or grey), orange, brightgreen, yellow, brightblue,
# brightmagenta, brightcyan, white, trueblack, purple, silver, maroon, fuchsia,
# lime, olive, navy, teal, aqua, activeborder, activecaption, appworkspace,
# background, btnface, btnshadow, btntext, captiontext, graytext, highlight,
# highlighttext, inactiveborder, inactivecaption, menu, menutext, scrollbar,
# window, windowframe, windowtext.
OPTIONS=windowcolors:status windowtext/window message windowtext/window
#
#HACKDIR=c:\games\nethack

4
win/win32/mhmain.c
View File

@@ -888,8 +888,8 @@ static struct t_menu2mapmode {
{ IDM_MAP_ASCII16X8, MAP_MODE_ASCII16x8 },
{ IDM_MAP_ASCII7X12, MAP_MODE_ASCII7x12 },
{ IDM_MAP_ASCII8X12, MAP_MODE_ASCII8x12 },
{ IDM_MAP_ASCII12X16, MAP_MODE_ASCII16x12 },
{ IDM_MAP_ASCII16X12, MAP_MODE_ASCII12x16 },
{ IDM_MAP_ASCII12X16, MAP_MODE_ASCII12x16 },
{ IDM_MAP_ASCII16X12, MAP_MODE_ASCII16x12 },
{ IDM_MAP_ASCII10X18, MAP_MODE_ASCII10x18 },
{ IDM_MAP_FIT_TO_SCREEN, MAP_MODE_ASCII_FIT_TO_SCREEN },
{ -1, -1 }

25
win/win32/mswproc.c
View File

@@ -185,6 +185,13 @@ void mswin_init_nhwindows(int* argc, char** argv)
/* force tabs in menus */
iflags.menu_tab_sep = 1;
/* force toptenwin to be true. toptenwin is the option that decides whether to
* write output to a window or stdout. stdout doesn't make sense on Windows
* non-console applications
*/
flags.toptenwin = 1;
set_option_mod_status("toptenwin", SET_IN_FILE);
/* initialize map tiles bitmap */
initMapTiles();
@@ -1943,24 +1950,24 @@ typedef struct ctbv
static color_table_brush_value color_table_brush[] = {
{ "activeborder", COLOR_ACTIVEBORDER },
{ "activecaption", COLOR_ACTIVECAPTION },
{ "appworkspace", COLOR_APPWORKSPACE },
{ "background", COLOR_BACKGROUND },
{ "appworkspace", COLOR_APPWORKSPACE },
{ "background", COLOR_BACKGROUND },
{ "btnface", COLOR_BTNFACE },
{ "btnshadow", COLOR_BTNSHADOW },
{ "btntext", COLOR_BTNTEXT },
{ "captiontext", COLOR_CAPTIONTEXT },
{ "captiontext", COLOR_CAPTIONTEXT },
{ "graytext", COLOR_GRAYTEXT },
{ "greytext", COLOR_GRAYTEXT },
{ "highlight", COLOR_HIGHLIGHT },
{ "highlight", COLOR_HIGHLIGHT },
{ "highlighttext", COLOR_HIGHLIGHTTEXT },
{ "inactiveborder", COLOR_INACTIVEBORDER },
{ "inactivecaption", COLOR_INACTIVECAPTION },
{ "menu", COLOR_MENU },
{ "menu", COLOR_MENU },
{ "menutext", COLOR_MENUTEXT },
{ "scrollbar", COLOR_SCROLLBAR },
{ "window", COLOR_WINDOW },
{ "windowframe", COLOR_WINDOWFRAME },
{ "windowtext", COLOR_WINDOWTEXT },
{ "scrollbar", COLOR_SCROLLBAR },
{ "window", COLOR_WINDOW },
{ "windowframe", COLOR_WINDOWFRAME },
{ "windowtext", COLOR_WINDOWTEXT },
{ "", -1 },
};