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

symset customization warning fixes

Browse Source
This commit is contained in:
PatR
2024-03-23 13:39:23 -07:00
parent 5c43c81018
commit d2928ce2ba
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/wintty.h
+1 -1
View File
@@ -21,7 +21,7 @@ struct tty_perminvent_cell {
Bitfield(text, 1); Bitfield(text, 1);
Bitfield(glyph, 1); Bitfield(glyph, 1);
union ttycellcontent content; union ttycellcontent content;
int32_t color; /* adjusted color 0 = ignore uint32 color; /* adjusted color 0 = ignore
* 1-16 = NetHack color + 1 * 1-16 = NetHack color + 1
* 17..16,777,233 = 24-bit color + 17 * 17..16,777,233 = 24-bit color + 17
*/ */
src/decl.c
+1 -1
View File
@@ -756,7 +756,7 @@ static const struct instance_globals_s g_init_s = {
{ 0, 0 }, /* save_dlevel */ { 0, 0 }, /* save_dlevel */
/* symbols.c */ /* symbols.c */
{ DUMMY }, /* symset */ { DUMMY }, /* symset */
{ { 0 }, { 0 } }, /* symset_customizations */ { { { 0 } }, { { 0 } } }, /* symset_customizations */
DUMMY, /* showsyms */ DUMMY, /* showsyms */
/* files.c */ /* files.c */
0, /* symset_count */ 0, /* symset_count */
win/tty/wintty.c
+6 -5
View File
@@ -287,7 +287,7 @@ static void tty_invent_box_glyph_init(struct WinDesc *cw);
static boolean assesstty(enum inv_modes, short *, short *, static boolean assesstty(enum inv_modes, short *, short *,
long *, long *, long *, long *, long *); long *, long *, long *, long *, long *);
static void ttyinv_populate_slot(struct WinDesc *, int, int, static void ttyinv_populate_slot(struct WinDesc *, int, int,
const char *, int32_t, int); const char *, uint32, int);
#endif /* TTY_PERM_INVENT */ #endif /* TTY_PERM_INVENT */
/* /*
@@ -3067,7 +3067,8 @@ ttyinv_add_menu(
row = (slot % rows_per_side) + 1; /* +1: top border */ row = (slot % rows_per_side) + 1; /* +1: top border */
/* side: left side panel or right side panel, not a window column */ /* side: left side panel or right side panel, not a window column */
side = slot / rows_per_side; side = slot / rows_per_side;
ttyinv_populate_slot(cw, row, side, text, clr, startcolor_at); ttyinv_populate_slot(cw, row, side, text,
(uint32) clr, startcolor_at);
} }
return; return;
} }
@@ -3220,8 +3221,8 @@ ttyinv_end_menu(int window, struct WinDesc *cw)
static void static void
ttyinv_render(winid window, struct WinDesc *cw) ttyinv_render(winid window, struct WinDesc *cw)
{ {
int row, col, slot, side, filled_count = 0, slot_limit, int row, col, slot, side, filled_count = 0, slot_limit;
current_row_color = NO_COLOR; uint32 current_row_color = NO_COLOR;
struct tty_perminvent_cell *cell; struct tty_perminvent_cell *cell;
char invbuf[BUFSZ]; char invbuf[BUFSZ];
boolean force_redraw = gp.program_state.in_docrt ? TRUE : FALSE, boolean force_redraw = gp.program_state.in_docrt ? TRUE : FALSE,
@@ -3335,7 +3336,7 @@ ttyinv_populate_slot(
int row, /* 'row' within the window, not within screen */ int row, /* 'row' within the window, not within screen */
int side, /* 'side'==0 is left panel or ==1 is right panel */ int side, /* 'side'==0 is left panel or ==1 is right panel */
const char *text, const char *text,
int32_t color, uint32 color,
int clroffset) int clroffset)
{ {
struct tty_perminvent_cell *cell; struct tty_perminvent_cell *cell;