Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7
This commit is contained in:
@@ -3724,7 +3724,7 @@ extern void zapsetup(void);
|
||||
extern void zapwrapup(void);
|
||||
extern void weffects(struct obj *) NONNULLARG1;
|
||||
extern int spell_damage_bonus(int);
|
||||
extern const char *exclam(int force);
|
||||
extern const char *exclam(int force) NONNULL;
|
||||
extern void hit(const char *, struct monst *, const char *) NONNULLPTRS;
|
||||
extern void miss(const char *, struct monst *) NONNULLPTRS;
|
||||
extern struct monst *bhit(coordxy, coordxy, int, enum bhit_call_types,
|
||||
@@ -3751,7 +3751,7 @@ extern void destroy_item(int, int);
|
||||
extern int destroy_mitem(struct monst *, int, int) NONNULLARG1;
|
||||
extern int resist(struct monst *, char, int, int) NONNULLARG1;
|
||||
extern void makewish(void);
|
||||
extern const char *flash_str(int, boolean);
|
||||
extern const char *flash_str(int, boolean) NONNULL;
|
||||
|
||||
/* ### unixmain.c, windsys.c ### */
|
||||
|
||||
|
||||
@@ -14,12 +14,12 @@ struct wseg {
|
||||
coordxy wx, wy; /* the segment's position */
|
||||
};
|
||||
|
||||
static void toss_wsegs(struct wseg *, boolean);
|
||||
static void toss_wsegs(struct wseg *, boolean) NO_NNARGS;
|
||||
static void shrink_worm(int);
|
||||
#if 0
|
||||
static void random_dir(int, int, int *, int *);
|
||||
#endif
|
||||
static struct wseg *create_worm_tail(int);
|
||||
static struct wseg *create_worm_tail(int); /* may return NULL */
|
||||
|
||||
/* Description of long worm implementation.
|
||||
*
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
|
||||
#include "hack.h"
|
||||
|
||||
static void m_lose_armor(struct monst *, struct obj *, boolean);
|
||||
static void clear_bypass(struct obj *);
|
||||
static void m_dowear_type(struct monst *, long, boolean, boolean);
|
||||
static int extra_pref(struct monst *, struct obj *);
|
||||
static void m_lose_armor(struct monst *, struct obj *, boolean) NONNULLPTRS;
|
||||
static void clear_bypass(struct obj *) NO_NNARGS;
|
||||
static void m_dowear_type(struct monst *, long, boolean, boolean) NONNULLARG1;
|
||||
static int extra_pref(struct monst *, struct obj *) NONNULLARG1;
|
||||
|
||||
const struct worn {
|
||||
long w_mask;
|
||||
|
||||
Reference in New Issue
Block a user