Merge branch 'NetHack-3.6'
# Conflicts: # DEVEL/Developer.txt # include/config.h # include/decl.h # include/display.h # include/extern.h # include/global.h # include/hack.h # include/patchlevel.h # src/display.c # src/dothrow.c # src/makemon.c # src/monst.c # src/objnam.c # src/sp_lev.c # src/wield.c # src/zap.c # sys/share/pmatchregex.c # sys/winnt/Makefile.msc
This commit is contained in:
@@ -116,9 +116,6 @@ struct window_procs mswin_procs = {
|
||||
mswin_status_init, mswin_status_finish, mswin_status_enablefield,
|
||||
mswin_status_update,
|
||||
genl_can_suspend_yes,
|
||||
#ifdef NEW_KEYBOARD_HIT
|
||||
mswin_keyboard_hit
|
||||
#endif
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -1405,15 +1402,6 @@ mswin_nhgetch()
|
||||
return (key);
|
||||
}
|
||||
|
||||
#ifdef NEW_KEYBOARD_HIT
|
||||
/* boolean keyboard_hit() -- returns TRUE if input is available */
|
||||
boolean
|
||||
mswin_keyboard_hit()
|
||||
{
|
||||
return mswin_have_input() != 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
int nh_poskey(int *x, int *y, int *mod)
|
||||
-- Returns a single character input from the user or a
|
||||
|
||||
Reference in New Issue
Block a user