From: PatR Date: Fri, 15 Sep 2017 11:33:09 +0000 (-0700) Subject: zap.c formatting X-Git-Tag: NetHack-3.6.1_RC01~361 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c38dc0edc0942153ae7dd78783eac20f5ef23560;p=nethack zap.c formatting --- diff --git a/src/zap.c b/src/zap.c index fb5dd857a..add78a0de 100644 --- a/src/zap.c +++ b/src/zap.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 zap.c $NHDT-Date: 1470819844 2016/08/10 09:04:04 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.263 $ */ +/* NetHack 3.6 zap.c $NHDT-Date: 1505475171 2017/09/15 11:32:51 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.267 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2127,6 +2127,7 @@ backfire(otmp) struct obj *otmp; { int dmg; + otmp->in_use = TRUE; /* in case losehp() is fatal */ pline("%s suddenly explodes!", The(xname(otmp))); dmg = d(otmp->spe + 2, 6); @@ -3070,6 +3071,7 @@ int range, *skipstart, *skipend; { int tr = (range / 4); int tmp = range - ((tr > 0) ? rnd(tr) : 0); + *skipstart = tmp; *skipend = tmp - ((tmp / 4) * rnd(3)); if (*skipend >= tmp) @@ -3880,10 +3882,10 @@ const char *fltxt; } void -buzz(type,nd,sx,sy,dx,dy) +buzz(type, nd, sx, sy, dx, dy) int type, nd; -xchar sx,sy; -int dx,dy; +xchar sx, sy; +int dx, dy; { dobuzz(type, nd, sx, sy, dx, dy, TRUE); } @@ -3898,7 +3900,7 @@ int dx,dy; * called with dx = dy = 0 with vertical bolts */ void -dobuzz(type, nd, sx, sy, dx, dy,say) +dobuzz(type, nd, sx, sy, dx, dy, say) register int type, nd; register xchar sx, sy; register int dx, dy; @@ -4145,7 +4147,7 @@ boolean say; /* Announce out of sight hit/miss events if true */ ? "shatter" /* "damage" indicates wall rather than door */ : abstype == ZT_ACID - ? "damage" + ? "damage" : abstype == ZT_DEATH ? "disintegrate" : "destroy",