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

split wand explosion into separate function

Browse Source
This commit is contained in:
SHIRAKATA Kentaro
2023-11-13 07:24:15 -08:00
committed by PatR
parent 86914f03f0
commit 4250dd91d8
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apply.c
+16 -13
View File
@@ -38,6 +38,7 @@ static int grapple_range(void);
static boolean can_grapple_location(coordxy, coordxy); static boolean can_grapple_location(coordxy, coordxy);
static int use_grapple(struct obj *); static int use_grapple(struct obj *);
static void discard_broken_wand(void); static void discard_broken_wand(void);
static void broken_wand_explode(struct obj *, int, int);
static int do_break_wand(struct obj *); static int do_break_wand(struct obj *);
static int apply_ok(struct obj *); static int apply_ok(struct obj *);
static int flip_through_book(struct obj *); static int flip_through_book(struct obj *);
@@ -3726,6 +3727,14 @@ discard_broken_wand(void)
nomul(0); nomul(0);
} }
static void
broken_wand_explode(struct obj *obj, int dmg, int expltype)
{
explode(u.ux, u.uy, -(obj->otyp), dmg, WAND_CLASS, expltype);
makeknown(obj->otyp); /* explode describes the effect */
discard_broken_wand();
}
/* return 1 if the wand is broken, hence some time elapsed */ /* return 1 if the wand is broken, hence some time elapsed */
static int static int
do_break_wand(struct obj *obj) do_break_wand(struct obj *obj)
@@ -3739,7 +3748,6 @@ do_break_wand(struct obj *obj)
boolean affects_objects; boolean affects_objects;
boolean shop_damage = FALSE; boolean shop_damage = FALSE;
boolean fillmsg = FALSE; boolean fillmsg = FALSE;
int expltype = EXPL_MAGICAL;
char confirm[QBUFSZ], buf[BUFSZ]; char confirm[QBUFSZ], buf[BUFSZ];
boolean is_fragile = (objdescr_is(obj, "balsa") boolean is_fragile = (objdescr_is(obj, "balsa")
|| objdescr_is(obj, "glass")); || objdescr_is(obj, "glass"));
@@ -3815,21 +3823,16 @@ do_break_wand(struct obj *obj)
return ECMD_TIME; return ECMD_TIME;
case WAN_DEATH: case WAN_DEATH:
case WAN_LIGHTNING: case WAN_LIGHTNING:
dmg *= 4; broken_wand_explode(obj, dmg * 4, EXPL_MAGICAL);
goto wanexpl; return ECMD_TIME;
case WAN_FIRE: case WAN_FIRE:
expltype = EXPL_FIERY; broken_wand_explode(obj, dmg * 2, EXPL_FIERY);
/*FALLTHRU*/ return ECMD_TIME;
case WAN_COLD: case WAN_COLD:
if (expltype == EXPL_MAGICAL) broken_wand_explode(obj, dmg * 2, EXPL_FROSTY);
expltype = EXPL_FROSTY; return ECMD_TIME;
dmg *= 2;
/*FALLTHRU*/
case WAN_MAGIC_MISSILE: case WAN_MAGIC_MISSILE:
wanexpl: broken_wand_explode(obj, dmg, EXPL_MAGICAL);
explode(u.ux, u.uy, -(obj->otyp), dmg, WAND_CLASS, expltype);
makeknown(obj->otyp); /* explode describes the effect */
discard_broken_wand();
return ECMD_TIME; return ECMD_TIME;
case WAN_STRIKING: case WAN_STRIKING:
/* we want this before the explosion instead of at the very end */ /* we want this before the explosion instead of at the very end */