Merge branch 'NetHack-3.7' into expanded-glyphs

This commit is contained in:
nhmall
2021-09-19 14:45:02 -04:00
9 changed files with 181 additions and 50 deletions

View File

@@ -2142,6 +2142,7 @@ extern void assign_candy_wrapper(struct obj *);
extern int doread(void);
extern int charge_ok(struct obj *);
extern void recharge(struct obj *, int);
extern boolean valid_cloud_pos(int, int);
extern int seffects(struct obj *);
extern void drop_boulder_on_player(boolean, boolean, boolean, boolean);
extern boolean drop_boulder_on_monster(int, int, boolean, boolean);

View File

@@ -35,7 +35,7 @@ struct shclass {
struct itp {
int iprob; /* probability of an item type */
int itype; /* item type: if >=0 a class, if < 0 a specific item */
} iprobs[6];
} iprobs[9];
const char *const *shknms; /* list of shopkeeper names for this type */
};