Merge remote-tracking branch 'origin/NetHack-3.6.0'

This commit is contained in:
keni
2016-10-02 15:26:11 -04:00
15 changed files with 686 additions and 307 deletions

View File

@@ -173,6 +173,7 @@ struct sysflag {
#define GPCOORDS_NONE 'n'
#define GPCOORDS_MAP 'm'
#define GPCOORDS_COMPASS 'c'
#define GPCOORDS_COMFULL 'f'
#define GPCOORDS_SCREEN 's'
struct instance_flags {

View File

@@ -102,6 +102,14 @@
#define CXN_ARTICLE 8 /* include a/an/the prefix */
#define CXN_NOCORPSE 16 /* suppress " corpse" suffix */
/* getpos() return values */
enum getpos_retval {
LOOK_TRADITIONAL = 0, /* '.' -- ask about "more info?" */
LOOK_QUICK, /* ',' -- skip "more info?" */
LOOK_ONCE, /* ';' -- skip and stop looping */
LOOK_VERBOSE /* ':' -- show more info w/o asking */
};
/*
* This is the way the game ends. If these are rearranged, the arrays
* in end.c and topten.c will need to be changed. Some parts of the