From 488afffcd7de72c904d5ffe30ca4be754b399438 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Wed, 20 Dec 2023 20:09:50 +0200 Subject: [PATCH] Fix NONNULL for hitting bare handed --- include/extern.h | 4 ++-- src/weapon.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/extern.h b/include/extern.h index d38f79796..0b1003905 100644 --- a/include/extern.h +++ b/include/extern.h @@ -3503,8 +3503,8 @@ extern int weapon_type(struct obj *) NO_NONNULLS; extern int uwep_skill_type(void); /* find_roll_to_hit() calls weapon_hit_bonus() with a NULL argument, preventing NONNULLARG1 */ -extern int weapon_hit_bonus(struct obj *) NO_NONNULLS; -extern int weapon_dam_bonus(struct obj *) NONNULLARG1; +extern int weapon_hit_bonus(struct obj *); +extern int weapon_dam_bonus(struct obj *); extern void skill_init(const struct def_skill *) NONNULLARG1; extern void setmnotwielded(struct monst *, struct obj *) NONNULLARG1; diff --git a/src/weapon.c b/src/weapon.c index a4db60e92..7e7ce587e 100644 --- a/src/weapon.c +++ b/src/weapon.c @@ -1431,6 +1431,7 @@ uwep_skill_type(void) /* * Return hit bonus/penalty based on skill of weapon. + * weapon can be null, meaning bare-handed combat. * Treat restricted weapons as unskilled. */ int @@ -1525,6 +1526,7 @@ weapon_hit_bonus(struct obj *weapon) /* * Return damage bonus/penalty based on skill of weapon. + * weapon can be null, meaning bare-handed combat. * Treat restricted weapons as unskilled. */ int