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

Clean up the lava code a little.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-18 23:19:23 -05:00
parent d34bc6fd73
commit ad4f3fc0fe
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/trap.c
View File

@@ -4713,9 +4713,11 @@ lava_effects()
* from boots. */ * from boots. */
if (Wwalking && uarmf && is_organic(uarmf) && !uarmf->oerodeproof) { if (Wwalking && uarmf && is_organic(uarmf) && !uarmf->oerodeproof) {
obj = uarmf; obj = uarmf;
pline("Your %s into flame!", aobjnam(obj, "burst")); pline("%s into flame!", Yobjnam2(obj, "burst"));
setequip(os_armf, NULL, em_silent); iflags.in_lava_effects++; /* (see above) */
useupall(obj); (void) Boots_off();
useup(obj);
iflags.in_lava_effects--;
} }
if (!Fire_resistance) { if (!Fire_resistance) {
@@ -4773,22 +4775,7 @@ lava_effects()
} }
You("find yourself back on solid %s.", surface(u.ux, u.uy)); You("find yourself back on solid %s.", surface(u.ux, u.uy));
return(TRUE); return(TRUE);
} /* !Fire_resistance */ } else if (!Wwalking && (!u.utrap || u.utraptype != TT_LAVA)) {
/* just want to burn boots, not all armor; destroy_item doesn't work on
armor anyway */
burn_stuff:
if (uarmf && !uarmf->oerodeproof && is_organic(uarmf) &&
objects[uarmf->otyp].oc_oprop != FIRE_RES) {
/* save uarmf value because Boots_off() sets uarmf to null */
obj = uarmf;
pline("%s into flame!", Yobjnam2(obj, "burst"));
iflags.in_lava_effects++; /* (see above) */
(void) Boots_off();
useup(obj);
iflags.in_lava_effects--;
}
if (!Wwalking) {
boil_away = !Fire_resistance; boil_away = !Fire_resistance;
/* if not fire resistant, sink_into_lava() will quickly be fatal; /* if not fire resistant, sink_into_lava() will quickly be fatal;
hero needs to escape immediately */ hero needs to escape immediately */
@@ -4801,6 +4788,8 @@ burn_stuff:
losehp(!boil_away ? 1 : (u.uhp / 2), losehp(!boil_away ? 1 : (u.uhp / 2),
lava_killer, KILLED_BY); /* lava damage */ lava_killer, KILLED_BY); /* lava damage */
} }
burn_stuff:
destroy_item(SCROLL_CLASS, AD_FIRE); destroy_item(SCROLL_CLASS, AD_FIRE);
destroy_item(SPBOOK_CLASS, AD_FIRE); destroy_item(SPBOOK_CLASS, AD_FIRE);
destroy_item(POTION_CLASS, AD_FIRE); destroy_item(POTION_CLASS, AD_FIRE);