Merge branch 'NetHack-3.7' into twitch-interact

This commit is contained in:
2026-04-23 20:37:34 -07:00
22 changed files with 270 additions and 142 deletions

View File

@@ -198,7 +198,7 @@ struct ami_sysflags {
boolean altmeta; /* use ALT keys as META */
boolean amiflush; /* kill typeahead */
#endif
#ifdef AMII_GRAPHICS
#ifdef AMII_GRAPHICS
int numcols;
unsigned short amii_dripens[20]; /* DrawInfo Pens currently there are 13 in v39 */
AMII_COLOR_TYPE amii_curmap[AMII_MAXCOLORS]; /* colormap */

View File

@@ -510,6 +510,7 @@ extern void destroy_drawbridge(coordxy, coordxy);
/* ### decl.c ### */
extern void program_state_init(void);
extern void decl_globals_init(void);
extern void sa_victual(volatile struct victual_info *);

View File

@@ -19,7 +19,7 @@ enum wp_ids { wp_tty = 1, wp_X11, wp_Qt, wp_mswin, wp_curses,
#ifdef OUTDATED_STUFF
wp_mac, wp_Gem, wp_Gnome,
#endif
wp_trace // XXX do we need this? should chainin/out get an id? TBD
wp_trace // XXX do we need this? should chainin/out get an id? TBD
};
/* NB: this MUST match chain_procs below */