Merge branch 'master' into NetHack-3.7

This commit is contained in:
nhmall
2019-06-24 19:47:22 -04:00
5 changed files with 39 additions and 21 deletions

View File

@@ -477,6 +477,7 @@ enum bodypart_types {
#define POTION_OCCUPANT_CHANCE(n) (13 + 2 * (n))
#define WAND_BACKFIRE_CHANCE 100
#define BALL_IN_MON (u.uswallow && uball && uball->where == OBJ_FREE)
#define CHAIN_IN_MON (u.uswallow && uchain && uchain->where == OBJ_FREE)
#define NODIAG(monnum) ((monnum) == PM_GRID_BUG)
/* Flags to control menus */