WARNsify...

1 files changed, 137 insertions, 118 deletions

diff --git a/hack/hack.steal.c b/hack/hack.steal.c
index 9fdae8f4..4c68a5f7 100644
--- a/hack/hack.steal.c
+++ b/hack/hack.steal.c
@@ -1,33 +1,44 @@
+/*	$NetBSD: hack.steal.c,v 1.4 1997/10/19 16:59:04 christos Exp $	*/
+
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char rcsid[] = "$NetBSD: hack.steal.c,v 1.3 1995/03/23 08:31:34 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.steal.c,v 1.4 1997/10/19 16:59:04 christos Exp $");
+#endif				/* not lint */
 
+#include <stdlib.h>
 #include "hack.h"
+#include "extern.h"
 
-long		/* actually returns something that fits in an int */
-somegold(){
-	return( (u.ugold < 100) ? u.ugold :
-		(u.ugold > 10000) ? rnd(10000) : rnd((int) u.ugold) );
+long				/* actually returns something that fits in an
+				 * int */
+somegold()
+{
+	return ((u.ugold < 100) ? u.ugold :
+		(u.ugold > 10000) ? rnd(10000) : rnd((int) u.ugold));
 }
 
-stealgold(mtmp)  register struct monst *mtmp; {
-register struct gold *gold = g_at(u.ux, u.uy);
-register long tmp;
-	if(gold && ( !u.ugold || gold->amount > u.ugold || !rn2(5))) {
+void
+stealgold(mtmp)
+	struct monst   *mtmp;
+{
+	struct gold    *gold = g_at(u.ux, u.uy);
+	long            tmp;
+	if (gold && (!u.ugold || gold->amount > u.ugold || !rn2(5))) {
 		mtmp->mgold += gold->amount;
 		freegold(gold);
-		if(Invisible) newsym(u.ux, u.uy);
+		if (Invisible)
+			newsym(u.ux, u.uy);
 		pline("%s quickly snatches some gold from between your feet!",
-			Monnam(mtmp));
-		if(!u.ugold || !rn2(5)) {
+		      Monnam(mtmp));
+		if (!u.ugold || !rn2(5)) {
 			rloc(mtmp);
 			mtmp->mflee = 1;
 		}
-	} else if(u.ugold) {
+	} else if (u.ugold) {
 		u.ugold -= (tmp = somegold());
 		pline("Your purse feels lighter.");
 		mtmp->mgold += tmp;
@@ -38,108 +49,112 @@ register long tmp;
 }
 
 /* steal armor after he finishes taking it off */
-unsigned stealoid;		/* object to be stolen */
-unsigned stealmid;		/* monster doing the stealing */
-stealarm(){
-	register struct monst *mtmp;
-	register struct obj *otmp;
+unsigned        stealoid;	/* object to be stolen */
+unsigned        stealmid;	/* monster doing the stealing */
+int
+stealarm()
+{
+	struct monst   *mtmp;
+	struct obj     *otmp;
 
-	for(otmp = invent; otmp; otmp = otmp->nobj)
-	  if(otmp->o_id == stealoid) {
-	    for(mtmp = fmon; mtmp; mtmp = mtmp->nmon)
-	      if(mtmp->m_id == stealmid) {
-		if(dist(mtmp->mx,mtmp->my) < 3) {
-		  freeinv(otmp);
-		  pline("%s steals %s!", Monnam(mtmp), doname(otmp));
-		  mpickobj(mtmp,otmp);
-		  mtmp->mflee = 1;
-		  rloc(mtmp);
+	for (otmp = invent; otmp; otmp = otmp->nobj)
+		if (otmp->o_id == stealoid) {
+			for (mtmp = fmon; mtmp; mtmp = mtmp->nmon)
+				if (mtmp->m_id == stealmid) {
+					if (dist(mtmp->mx, mtmp->my) < 3) {
+						freeinv(otmp);
+						pline("%s steals %s!", Monnam(mtmp), doname(otmp));
+						mpickobj(mtmp, otmp);
+						mtmp->mflee = 1;
+						rloc(mtmp);
+					}
+					break;
+				}
+			break;
 		}
-		break;
-	      }
-	    break;
-	  }
 	stealoid = 0;
+	return 0;
 }
 
 /* returns 1 when something was stolen */
 /* (or at least, when N should flee now) */
 /* avoid stealing the object stealoid */
+int
 steal(mtmp)
-struct monst *mtmp;
+	struct monst   *mtmp;
 {
-	register struct obj *otmp;
-	register tmp;
-	register named = 0;
+	struct obj     *otmp;
+	int		tmp;
+	int		named = 0;
 
-	if(!invent){
-	    if(Blind)
-	      pline("Somebody tries to rob you, but finds nothing to steal.");
-	    else
-	      pline("%s tries to rob you, but she finds nothing to steal!",
-		Monnam(mtmp));
-	    return(1);	/* let her flee */
+	if (!invent) {
+		if (Blind)
+			pline("Somebody tries to rob you, but finds nothing to steal.");
+		else
+			pline("%s tries to rob you, but she finds nothing to steal!",
+			      Monnam(mtmp));
+		return (1);	/* let her flee */
 	}
 	tmp = 0;
-	for(otmp = invent; otmp; otmp = otmp->nobj) if(otmp != uarm2)
-		tmp += ((otmp->owornmask & (W_ARMOR | W_RING)) ? 5 : 1);
+	for (otmp = invent; otmp; otmp = otmp->nobj)
+		if (otmp != uarm2)
+			tmp += ((otmp->owornmask & (W_ARMOR | W_RING)) ? 5 : 1);
 	tmp = rn2(tmp);
-	for(otmp = invent; otmp; otmp = otmp->nobj) if(otmp != uarm2)
-		if((tmp -= ((otmp->owornmask & (W_ARMOR | W_RING)) ? 5 : 1))
-			< 0) break;
-	if(!otmp) {
+	for (otmp = invent; otmp; otmp = otmp->nobj)
+		if (otmp != uarm2)
+			if ((tmp -= ((otmp->owornmask & (W_ARMOR | W_RING)) ? 5 : 1))
+			    < 0)
+				break;
+	if (!otmp) {
 		impossible("Steal fails!");
-		return(0);
+		return (0);
 	}
-	if(otmp->o_id == stealoid)
-		return(0);
-	if((otmp->owornmask & (W_ARMOR | W_RING))){
-		switch(otmp->olet) {
+	if (otmp->o_id == stealoid)
+		return (0);
+	if ((otmp->owornmask & (W_ARMOR | W_RING))) {
+		switch (otmp->olet) {
 		case RING_SYM:
 			ringoff(otmp);
 			break;
 		case ARMOR_SYM:
-			if(multi < 0 || otmp == uarms){
-			  setworn((struct obj *) 0, otmp->owornmask & W_ARMOR);
-			  break;
+			if (multi < 0 || otmp == uarms) {
+				setworn((struct obj *) 0, otmp->owornmask & W_ARMOR);
+				break;
+			} {
+				int             curssv = otmp->cursed;
+				otmp->cursed = 0;
+				stop_occupation();
+				pline("%s seduces you and %s off your %s.",
+				      Amonnam(mtmp, Blind ? "gentle" : "beautiful"),
+				      otmp->cursed ? "helps you to take"
+				      : "you start taking",
+				      (otmp == uarmg) ? "gloves" :
+				      (otmp == uarmh) ? "helmet" : "armor");
+				named++;
+				(void) armoroff(otmp);
+				otmp->cursed = curssv;
+				if (multi < 0) {
+					/*
+					multi = 0;
+					nomovemsg = 0;
+					afternmv = 0;
+					*/
+					stealoid = otmp->o_id;
+					stealmid = mtmp->m_id;
+					afternmv = stealarm;
+					return (0);
+				}
+				break;
 			}
-		{ int curssv = otmp->cursed;
-			otmp->cursed = 0;
-			stop_occupation();
-			pline("%s seduces you and %s off your %s.",
-				Amonnam(mtmp, Blind ? "gentle" : "beautiful"),
-				otmp->cursed ? "helps you to take"
-					    : "you start taking",
-				(otmp == uarmg) ? "gloves" :
-				(otmp == uarmh) ? "helmet" : "armor");
-			named++;
-			(void) armoroff(otmp);
-			otmp->cursed = curssv;
-			if(multi < 0){
-				extern char *nomovemsg;
-				extern int (*afternmv)();
-				/*
-				multi = 0;
-				nomovemsg = 0;
-				afternmv = 0;
-				*/
-				stealoid = otmp->o_id;
-				stealmid = mtmp->m_id;
-				afternmv = stealarm;
-				return(0);
-			}
-			break;
-		}
 		default:
 			impossible("Tried to steal a strange worn thing.");
 		}
-	}
-	else if(otmp == uwep)
+	} else if (otmp == uwep)
 		setuwep((struct obj *) 0);
-	if(otmp->olet == CHAIN_SYM) {
+	if (otmp->olet == CHAIN_SYM) {
 		impossible("How come you are carrying that chain?");
 	}
-	if(Punished && otmp == uball){
+	if (Punished && otmp == uball) {
 		Punished = 0;
 		freeobj(uchain);
 		free((char *) uchain);
@@ -149,60 +164,64 @@ struct monst *mtmp;
 	}
 	freeinv(otmp);
 	pline("%s stole %s.", named ? "She" : Monnam(mtmp), doname(otmp));
-	mpickobj(mtmp,otmp);
-	return((multi < 0) ? 0 : 1);
+	mpickobj(mtmp, otmp);
+	return ((multi < 0) ? 0 : 1);
 }
 
-mpickobj(mtmp,otmp)
-register struct monst *mtmp;
-register struct obj *otmp;
+void
+mpickobj(mtmp, otmp)
+	struct monst   *mtmp;
+	struct obj     *otmp;
 {
 	otmp->nobj = mtmp->minvent;
 	mtmp->minvent = otmp;
 }
 
+int
 stealamulet(mtmp)
-register struct monst *mtmp;
+	struct monst   *mtmp;
 {
-	register struct obj *otmp;
+	struct obj     *otmp;
 
-	for(otmp = invent; otmp; otmp = otmp->nobj) {
-	    if(otmp->olet == AMULET_SYM) {
-		/* might be an imitation one */
-		if(otmp == uwep) setuwep((struct obj *) 0);
-		freeinv(otmp);
-		mpickobj(mtmp,otmp);
-		pline("%s stole %s!", Monnam(mtmp), doname(otmp));
-		return(1);
-	    }
+	for (otmp = invent; otmp; otmp = otmp->nobj) {
+		if (otmp->olet == AMULET_SYM) {
+			/* might be an imitation one */
+			if (otmp == uwep)
+				setuwep((struct obj *) 0);
+			freeinv(otmp);
+			mpickobj(mtmp, otmp);
+			pline("%s stole %s!", Monnam(mtmp), doname(otmp));
+			return (1);
+		}
 	}
-	return(0);
+	return (0);
 }
 
 /* release the objects the killed animal has stolen */
-relobj(mtmp,show)
-register struct monst *mtmp;
-register show;
+void
+relobj(mtmp, show)
+	struct monst   *mtmp;
+	int show;
 {
-	register struct obj *otmp, *otmp2;
+	struct obj     *otmp, *otmp2;
 
-	for(otmp = mtmp->minvent; otmp; otmp = otmp2){
+	for (otmp = mtmp->minvent; otmp; otmp = otmp2) {
 		otmp->ox = mtmp->mx;
 		otmp->oy = mtmp->my;
 		otmp2 = otmp->nobj;
 		otmp->nobj = fobj;
 		fobj = otmp;
 		stackobj(fobj);
-		if(show & cansee(mtmp->mx,mtmp->my))
-			atl(otmp->ox,otmp->oy,otmp->olet);
+		if (show & cansee(mtmp->mx, mtmp->my))
+			atl(otmp->ox, otmp->oy, otmp->olet);
 	}
 	mtmp->minvent = (struct obj *) 0;
-	if(mtmp->mgold || mtmp->data->mlet == 'L') {
-		register long tmp;
+	if (mtmp->mgold || mtmp->data->mlet == 'L') {
+		long            tmp;
 
 		tmp = (mtmp->mgold > 10000) ? 10000 : mtmp->mgold;
-		mkgold((long)(tmp + d(dlevel,30)), mtmp->mx, mtmp->my);
-		if(show & cansee(mtmp->mx,mtmp->my))
-			atl(mtmp->mx,mtmp->my,'$');
+		mkgold((long) (tmp + d(dlevel, 30)), mtmp->mx, mtmp->my);
+		if (show & cansee(mtmp->mx, mtmp->my))
+			atl(mtmp->mx, mtmp->my, '$');
 	}
 }