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

\#perminv, 1 of 2: groundwork

Browse Source 
Give the window-port side of *_update_inventory() an argument.
Calls in the core still omit that; invent.c's update_inventory()
is the only place that cares.
This commit is contained in:
PatR
2021-03-13 18:17:00 -08:00
parent 160344feaa
commit dd49431296
21 changed files with 235 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/win32/mswproc.c
+9 -6
View File
@@ -1233,9 +1233,9 @@ mswin_select_menu(winid wid, int how, MENU_ITEM_P **selected)
window up, otherwise empty.
*/
void
mswin_update_inventory(void)
mswin_update_inventory(int arg)
{
logDebug("mswin_update_inventory()\n");
logDebug("mswin_update_inventory(%d)\n", arg);
if (iflags.perm_invent && g.program_state.something_worth_saving
&& iflags.window_inited && WIN_INVEN != WIN_ERR)
display_inventory(NULL, FALSE);
@@ -1303,7 +1303,8 @@ void
mswin_print_glyph(winid wid, xchar x, xchar y,
const glyph_info *glyphinfo, const glyph_info *bkglyphinfo)
{
logDebug("mswin_print_glyph(%d, %d, %d, %d, %d, %lu)\n", wid, x, y, glyphinfo->glyph, bkglyphinfo->glyph);
logDebug("mswin_print_glyph(%d, %d, %d, %d, %d, %lu)\n",
wid, x, y, glyphinfo->glyph, bkglyphinfo->glyph);
if ((wid >= 0) && (wid < MAXWINDOWS)
&& (GetNHApp()->windowlist[wid].win != NULL)) {
@@ -2058,7 +2059,7 @@ mswin_preference_update(const char *pref)
}
if (stricmp(pref, "perm_invent") == 0) {
mswin_update_inventory();
mswin_update_inventory(0);
return;
}
}
@@ -3077,14 +3078,16 @@ status_update(int fldindex, genericptr_t ptr, int chg, int percent, int color, u
DISABLE_WARNING_FORMAT_NONLITERAL
void
mswin_status_update(int idx, genericptr_t ptr, int chg, int percent, int color, unsigned long *condmasks)
mswin_status_update(int idx, genericptr_t ptr, int chg, int percent,
int color, unsigned long *condmasks)
{
long cond, *condptr = (long *) ptr;
char *text = (char *) ptr;
MSNHMsgUpdateStatus update_cmd_data;
int ochar, ci;
logDebug("mswin_status_update(%d, %p, %d, %d, %x, %p)\n", idx, ptr, chg, percent, color, condmasks);
logDebug("mswin_status_update(%d, %p, %d, %d, %x, %p)\n",
idx, ptr, chg, percent, color, condmasks);
if (idx >= 0) {
win/win32/winMS.h
+1 -1
View File
@@ -161,7 +161,7 @@ void mswin_add_menu(winid wid, const glyph_info *glyphinfo,
const char *str, unsigned int itemflags);
void mswin_end_menu(winid wid, const char *prompt);
int mswin_select_menu(winid wid, int how, MENU_ITEM_P **selected);
void mswin_update_inventory(void);
void mswin_update_inventory(int);
void mswin_mark_synch(void);
void mswin_wait_synch(void);
void mswin_cliparound(int x, int y);