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

alternative to display_inventory for window-port

Browse Source 
Several window ports that support perm_invent were
using a call back to the core display_inventory()
function.

While calling from the window port back to core functions
is arguably not ideal in the first place, it was recently
brought to light that code NetHack-3.7 code changes to
display_inventory() actually caused it to stop repopulating
the perm_invent window as intended under certain circumstances.

For now, provide an alternative function, repopulate_perminvent(),
that hopefullshould still work the way it did previously.

There will likely be some additional changes after this to
further improve things, at some point.

For now though, this
Resolves #1454
This commit is contained in:
nhmall
2025-11-08 14:26:07 -05:00
parent 6fa324d52a
commit d5658018ac
8 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/shim/winshim.c
+3 -3
View File
@@ -172,11 +172,11 @@ VDECLCB(shim_status_update,
"vipiiip",
A2P fldidx, P2V ptr, A2P chg, A2P percent, A2P color, P2V colormasks)
#ifdef __EMSCRIPTEN__
/* XXX: calling display_inventory() from shim_update_inventory() causes reentrancy that breaks emscripten Asyncify */
/* this should be fine since according to windows.doc, the only purpose of shim_update_inventory() is to call display_inventory() */
/* XXX: calling repopulate_perminvent() from shim_update_inventory() causes reentrancy that breaks emscripten Asyncify */
/* this should be fine since according to windows.doc, the only purpose of shim_update_inventory() is to call repopulate_perminvent() */
void shim_update_inventory(int a1 UNUSED) {
if(iflags.perm_invent) {
display_inventory(NULL, FALSE);
repopulate_perminvent();
}
}