From e52620da269c85a93c3bb5d8c512a37fcb794edc Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Thu, 28 Mar 2002 14:24:29 +0000 Subject: [PATCH] (from Yitzhak) - mostly from Yitzhak, with a modification based on subsequent discussion. After installing everything (mail, cvs, etc) I found the compile was broken. Yitzhak: This fixes the compile. I used LONG for the types because using DWORD conflicted in Borland with signed/unsigned compare mismatches. [Also works around some perm_invent code destined for a later patch that got rolled in prematurely] --- win/win32/mswproc.c | 2 +- win/win32/winMS.h | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index 81e6c53b6..d7d3ffc4d 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -1181,7 +1181,7 @@ int mswin_select_menu(winid wid, int how, MENU_ITEM_P **selected) void mswin_update_inventory() { logDebug("mswin_update_inventory()\n"); - if (program_state.something_worth_saving) + if (program_state.something_worth_saving && flags.perm_invent) display_inventory(NULL, FALSE); } diff --git a/win/win32/winMS.h b/win/win32/winMS.h index 80d09fa93..0e685dc34 100644 --- a/win/win32/winMS.h +++ b/win/win32/winMS.h @@ -67,6 +67,16 @@ typedef struct mswin_nhwindow_app { DWORD saveRegistrySettings; /* Flag if we should save this time */ DWORD regNetHackMode; /* NetHack mode means no Windows keys in some places */ + + LONG regMainMinX; + LONG regMainMinY; + LONG regMainMaxX; + LONG regMainMaxY; + LONG regMainLeft; + LONG regMainTop; + LONG regMainBottom; + LONG regMainRight; + DWORD regMainShowState; } NHWinApp, *PNHWinApp; #define E extern @@ -90,7 +100,7 @@ void mswin_display_nhwindow(winid wid, BOOLEAN_P block); void mswin_destroy_nhwindow(winid wid); void mswin_curs(winid wid, int x, int y); void mswin_putstr(winid wid, int attr, const char *text); -void mswin_putstr_ex(winid wid, int attr, const char *text, boolean append); +void mswin_putstr_ex(winid wid, int attr, const char *text, int); void mswin_display_file(const char *filename,BOOLEAN_P must_exist); void mswin_start_menu(winid wid); void mswin_add_menu(winid wid, int glyph, const ANY_P * identifier, -- 2.40.0