nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2023-12-22 14:38:33 -05:00
parent 746d00d170 34d6cf105e
commit de8d1ef0d1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
+2 -2
View File
@@ -3724,7 +3724,7 @@ extern void zapsetup(void);
extern void zapwrapup(void); extern void zapwrapup(void);
extern void weffects(struct obj *) NONNULLARG1; extern void weffects(struct obj *) NONNULLARG1;
extern int spell_damage_bonus(int); 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 hit(const char *, struct monst *, const char *) NONNULLPTRS;
extern void miss(const char *, struct monst *) NONNULLPTRS; extern void miss(const char *, struct monst *) NONNULLPTRS;
extern struct monst *bhit(coordxy, coordxy, int, enum bhit_call_types, 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 destroy_mitem(struct monst *, int, int) NONNULLARG1;
extern int resist(struct monst *, char, int, int) NONNULLARG1; extern int resist(struct monst *, char, int, int) NONNULLARG1;
extern void makewish(void); extern void makewish(void);
extern const char *flash_str(int, boolean); extern const char *flash_str(int, boolean) NONNULL;
/* ### unixmain.c, windsys.c ### */ /* ### unixmain.c, windsys.c ### */
src/worm.c
+2 -2
View File
@@ -14,12 +14,12 @@ struct wseg {
coordxy wx, wy; /* the segment's position */ 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); static void shrink_worm(int);
#if 0 #if 0
static void random_dir(int, int, int *, int *); static void random_dir(int, int, int *, int *);
#endif #endif
static struct wseg *create_worm_tail(int); static struct wseg *create_worm_tail(int); /* may return NULL */
/* Description of long worm implementation. /* Description of long worm implementation.
* *
src/worn.c
+4 -4
View File
@@ -5,10 +5,10 @@
#include "hack.h" #include "hack.h"
static void m_lose_armor(struct monst *, struct obj *, boolean); static void m_lose_armor(struct monst *, struct obj *, boolean) NONNULLPTRS;
static void clear_bypass(struct obj *); static void clear_bypass(struct obj *) NO_NNARGS;
static void m_dowear_type(struct monst *, long, boolean, boolean); static void m_dowear_type(struct monst *, long, boolean, boolean) NONNULLARG1;
static int extra_pref(struct monst *, struct obj *); static int extra_pref(struct monst *, struct obj *) NONNULLARG1;
const struct worn { const struct worn {
long w_mask; long w_mask;