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

Apply a wielded bullwhip with fire-command

Browse Source
This commit is contained in:
Pasi Kallinen
2022-01-06 17:12:30 +02:00
parent 5b02ad521d
commit a77e1602f1
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/extern.h
View File

@@ -52,6 +52,7 @@ extern boolean catch_lit(struct obj *);
extern void use_unicorn_horn(struct obj **); extern void use_unicorn_horn(struct obj **);
extern boolean tinnable(struct obj *); extern boolean tinnable(struct obj *);
extern void reset_trapset(void); extern void reset_trapset(void);
extern int use_whip(struct obj *);
extern int use_pole(struct obj *, boolean); extern int use_pole(struct obj *, boolean);
extern void fig_transform(union any *, long); extern void fig_transform(union any *, long);
extern int unfixable_trouble_count(boolean); extern int unfixable_trouble_count(boolean);

3
src/apply.c
View File

@@ -28,7 +28,6 @@ static void use_trap(struct obj *);
static int touchstone_ok(struct obj *); static int touchstone_ok(struct obj *);
static void use_stone(struct obj *); static void use_stone(struct obj *);
static int set_trap(void); /* occupation callback */ static int set_trap(void); /* occupation callback */
static int use_whip(struct obj *);
static void display_polearm_positions(int); static void display_polearm_positions(int);
static int use_cream_pie(struct obj *); static int use_cream_pie(struct obj *);
static int jelly_ok(struct obj *); static int jelly_ok(struct obj *);
@@ -2689,7 +2688,7 @@ set_trap(void)
return 0; return 0;
} }
static int int
use_whip(struct obj *obj) use_whip(struct obj *obj)
{ {
char buf[BUFSZ]; char buf[BUFSZ];

3
src/dothrow.c
View File

@@ -451,6 +451,9 @@ dofire(void)
/* if we're wielding a polearm, apply it */ /* if we're wielding a polearm, apply it */
if (uwep && is_pole(uwep)) if (uwep && is_pole(uwep))
return use_pole(uwep, TRUE); return use_pole(uwep, TRUE);
/* if we're wielding a bullwhip, apply it */
else if (uwep && uwep->otyp == BULLWHIP)
return use_whip(uwep);
else if (iflags.fireassist else if (iflags.fireassist
&& uswapwep && is_pole(uswapwep) && uswapwep && is_pole(uswapwep)
&& !(uswapwep->cursed && uswapwep->bknown)) { && !(uswapwep->cursed && uswapwep->bknown)) {