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

feedback from exploding potions of acid (trunk only)

Browse Source 
water_damage() gave "A potion explodes!" when destroying potions of
acid even when it was a stack of multiple potions exploding.  The vague
fixes entry "grammar, spelling and other typos" covers this one....
This commit is contained in:
nethack.rankin
2007-08-25 00:32:10 +00:00
parent bd6e98e092
commit eca287ab89
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/trap.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)trap.c 3.5 2007/06/18 */ /* SCCS Id: @(#)trap.c 3.5 2007/08/24 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -3074,7 +3074,7 @@ struct obj **objp;
boolean force, here; boolean force, here;
{ {
register struct obj *obj = *objp, *otmp; register struct obj *obj = *objp, *otmp;
boolean loose_obj = (obj && obj->where == OBJ_FREE); boolean loose_obj = (obj && obj->where == OBJ_FREE), exploded = FALSE;
if (loose_obj && (obj->nobj || obj->nexthere)) { if (loose_obj && (obj->nobj || obj->nexthere)) {
/* [this should actually be a panic()] */ /* [this should actually be a panic()] */
@@ -3121,8 +3121,17 @@ boolean force, here;
else obj->otyp = SPE_BLANK_PAPER; else obj->otyp = SPE_BLANK_PAPER;
} else if (obj->oclass == POTION_CLASS) { } else if (obj->oclass == POTION_CLASS) {
if (obj->otyp == POT_ACID) { if (obj->otyp == POT_ACID) {
char *bufp, buf[BUFSZ];
boolean one = (obj->quan == 1L);
bufp = strcpy(buf, "potion");
if (!one) bufp = makeplural(bufp);
/* [should we damage player/monster?] */ /* [should we damage player/monster?] */
pline("A potion explodes!"); pline("%s %s %s!", /* "A potion explodes!" */
!exploded ? (one ? "A" : "Some") :
(one ? "Another" : "More"),
bufp, vtense(bufp, "explode"));
exploded = TRUE;
/* let caller know that obj has gone away /* let caller know that obj has gone away
[when obj is part of a list, delobj()'s [when obj is part of a list, delobj()'s
obj_extract_self() takes care of this; obj_extract_self() takes care of this;