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

rework the mode settings initialization core-side

Browse Source
This commit is contained in:
nhmall
2022-06-25 09:06:39 -04:00
parent cde9b7e481
commit e6b4e59523
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/invent.c
View File

@@ -5341,7 +5341,6 @@ display_binventory(int x, int y, boolean as_if_seen)
/* enum and structs are defined in wintype.h */ /* enum and structs are defined in wintype.h */
static perminvent_info zeropi = { 0 }; static perminvent_info zeropi = { 0 };
static perminvent_info pi_info; static perminvent_info pi_info;
static int invmode = InvNormal;
static char Empty[1] = { '\0' }; static char Empty[1] = { '\0' };
static int done_environment_var = 0; static int done_environment_var = 0;
#ifdef TTY_PERM_INVENT #ifdef TTY_PERM_INVENT
@@ -5354,20 +5353,20 @@ core_update_invent_slot()
static perminvent_info *pi = 0; static perminvent_info *pi = 0;
char *text, nxtlet; char *text, nxtlet;
int slot; int slot;
boolean show_gold = (invmode & InvShowGold) != 0, boolean show_gold, inuse_only, sparse;
inuse_only = (invmode & InvInUse) != 0,
sparse = (invmode & InvSparse) != 0;
const char *wport_id; const char *wport_id;
struct obj *obj; struct obj *obj;
if (!done_environment_var) { if (!done_environment_var) {
pi_info = zeropi;
/*TEMPORARY*/ /*TEMPORARY*/
char *envtmp = nh_getenv("TTYINV"); char *envtmp = nh_getenv("TTYINV");
invmode = envtmp ? atoi(envtmp) : InvNormal; pi_info.fromcore.invmode = envtmp ? atoi(envtmp) : InvNormal;
done_environment_var = 1; done_environment_var = 1;
pi_info = zeropi;
pi_info.fromcore.invmode = invmode;
} }
show_gold = (pi_info.fromcore.invmode & InvShowGold) != 0;
inuse_only = (pi_info.fromcore.invmode & InvInUse) != 0;
sparse = (pi_info.fromcore.invmode & InvSparse) != 0;
if ((g.perm_invent_win == WIN_ERR && g.core_invent_state) if ((g.perm_invent_win == WIN_ERR && g.core_invent_state)
|| (pi_info.tocore.tocore_flags & prohibited)) || (pi_info.tocore.tocore_flags & prohibited))