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

Fix NONNULL for hitting bare handed

Browse Source
This commit is contained in:
Pasi Kallinen
2023-12-20 20:09:50 +02:00
parent 0713b91beb
commit 488afffcd7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/extern.h
View File

@@ -3503,8 +3503,8 @@ extern int weapon_type(struct obj *) NO_NONNULLS;
extern int uwep_skill_type(void); extern int uwep_skill_type(void);
/* find_roll_to_hit() calls weapon_hit_bonus() with a NULL argument, /* find_roll_to_hit() calls weapon_hit_bonus() with a NULL argument,
preventing NONNULLARG1 */ preventing NONNULLARG1 */
extern int weapon_hit_bonus(struct obj *) NO_NONNULLS; extern int weapon_hit_bonus(struct obj *);
extern int weapon_dam_bonus(struct obj *) NONNULLARG1; extern int weapon_dam_bonus(struct obj *);
extern void skill_init(const struct def_skill *) NONNULLARG1; extern void skill_init(const struct def_skill *) NONNULLARG1;
extern void setmnotwielded(struct monst *, struct obj *) NONNULLARG1; extern void setmnotwielded(struct monst *, struct obj *) NONNULLARG1;

2
src/weapon.c
View File

@@ -1431,6 +1431,7 @@ uwep_skill_type(void)
/* /*
* Return hit bonus/penalty based on skill of weapon. * Return hit bonus/penalty based on skill of weapon.
* weapon can be null, meaning bare-handed combat.
* Treat restricted weapons as unskilled. * Treat restricted weapons as unskilled.
*/ */
int int
@@ -1525,6 +1526,7 @@ weapon_hit_bonus(struct obj *weapon)
/* /*
* Return damage bonus/penalty based on skill of weapon. * Return damage bonus/penalty based on skill of weapon.
* weapon can be null, meaning bare-handed combat.
* Treat restricted weapons as unskilled. * Treat restricted weapons as unskilled.
*/ */
int int