WARNsify...

1 files changed, 77 insertions, 59 deletions

diff --git a/hack/hack.mkobj.c b/hack/hack.mkobj.c
index d4e37fd7..39d4804f 100644
--- a/hack/hack.mkobj.c
+++ b/hack/hack.mkobj.c
@@ -1,60 +1,66 @@
+/*	$NetBSD: hack.mkobj.c,v 1.4 1997/10/19 16:58:29 christos Exp $	*/
+
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char rcsid[] = "$NetBSD: hack.mkobj.c,v 1.3 1995/03/23 08:30:47 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.mkobj.c,v 1.4 1997/10/19 16:58:29 christos Exp $");
+#endif				/* not lint */
 
 #include "hack.h"
+#include "extern.h"
 
-char mkobjstr[] = "))[[!!!!????%%%%/=**))[[!!!!????%%%%/=**(%";
-struct obj *mkobj(), *mksobj();
+char            mkobjstr[] = "))[[!!!!????%%%%/=**))[[!!!!????%%%%/=**(%";
 
-struct obj *
-mkobj_at(let,x,y)
-register let,x,y;
+struct obj     *
+mkobj_at(let, x, y)
+	int let, x, y;
 {
-	register struct obj *otmp = mkobj(let);
+	struct obj     *otmp = mkobj(let);
 	otmp->ox = x;
 	otmp->oy = y;
 	otmp->nobj = fobj;
 	fobj = otmp;
-	return(otmp);
+	return (otmp);
 }
 
-mksobj_at(otyp,x,y)
-register otyp,x,y;
+void
+mksobj_at(otyp, x, y)
+	int otyp, x, y;
 {
-	register struct obj *otmp = mksobj(otyp);
+	struct obj     *otmp = mksobj(otyp);
 	otmp->ox = x;
 	otmp->oy = y;
 	otmp->nobj = fobj;
 	fobj = otmp;
 }
 
-struct obj *
-mkobj(let) {
-	if(!let)
+struct obj     *
+mkobj(let)
+	int let;
+{
+	if (!let)
 		let = mkobjstr[rn2(sizeof(mkobjstr) - 1)];
-	return(
-	    mksobj(
-		letter(let) ?
-		    CORPSE + ((let > 'Z') ? (let-'a'+'Z'-'@'+1) : (let-'@'))
-		:   probtype(let)
-	    )
-	);
+	return (
+		mksobj(
+		       letter(let) ?
+	  CORPSE + ((let > 'Z') ? (let - 'a' + 'Z' - '@' + 1) : (let - '@'))
+		       : probtype(let)
+		       )
+		);
 }
-	
 
-struct obj zeroobj;
 
-struct obj *
+struct obj      zeroobj;
+
+struct obj     *
 mksobj(otyp)
-register otyp;
+	int otyp;
 {
-	register struct obj *otmp;
-	char let = objects[otyp].oc_olet;
+	struct obj     *otmp;
+	char            let = objects[otyp].oc_olet;
 
 	otmp = newobj(0);
 	*otmp = zeroobj;
@@ -63,23 +69,25 @@ register otyp;
 	otmp->quan = 1;
 	otmp->olet = let;
 	otmp->otyp = otyp;
-	otmp->dknown = index("/=!?*", let) ? 0 : 1;
-	switch(let) {
+	otmp->dknown = strchr("/=!?*", let) ? 0 : 1;
+	switch (let) {
 	case WEAPON_SYM:
-		otmp->quan = (otmp->otyp <= ROCK) ? rn1(6,6) : 1;
-		if(!rn2(11)) otmp->spe = rnd(3);
-		else if(!rn2(10)) {
+		otmp->quan = (otmp->otyp <= ROCK) ? rn1(6, 6) : 1;
+		if (!rn2(11))
+			otmp->spe = rnd(3);
+		else if (!rn2(10)) {
 			otmp->cursed = 1;
 			otmp->spe = -rnd(3);
 		}
 		break;
 	case FOOD_SYM:
-		if(otmp->otyp >= CORPSE) break;
+		if (otmp->otyp >= CORPSE)
+			break;
 #ifdef NOT_YET_IMPLEMENTED
 		/* if tins are to be identified, need to adapt doname() etc */
-		if(otmp->otyp == TIN)
+		if (otmp->otyp == TIN)
 			otmp->spe = rnd(...);
-#endif NOT_YET_IMPLEMENTED
+#endif	/* NOT_YET_IMPLEMENTED */
 		/* fall into next case */
 	case GEM_SYM:
 		otmp->quan = rn2(6) ? 1 : 2;
@@ -92,54 +100,64 @@ register otyp;
 	case AMULET_SYM:
 		break;
 	case ARMOR_SYM:
-		if(!rn2(8)) otmp->cursed = 1;
-		if(!rn2(10)) otmp->spe = rnd(3);
-		else if(!rn2(9)) {
+		if (!rn2(8))
+			otmp->cursed = 1;
+		if (!rn2(10))
+			otmp->spe = rnd(3);
+		else if (!rn2(9)) {
 			otmp->spe = -rnd(3);
 			otmp->cursed = 1;
 		}
 		break;
 	case WAND_SYM:
-		if(otmp->otyp == WAN_WISHING) otmp->spe = 3; else
-		otmp->spe = rn1(5,
-			(objects[otmp->otyp].bits & NODIR) ? 11 : 4);
+		if (otmp->otyp == WAN_WISHING)
+			otmp->spe = 3;
+		else
+			otmp->spe = rn1(5,
+			       (objects[otmp->otyp].bits & NODIR) ? 11 : 4);
 		break;
 	case RING_SYM:
-		if(objects[otmp->otyp].bits & SPEC) {
-			if(!rn2(3)) {
+		if (objects[otmp->otyp].bits & SPEC) {
+			if (!rn2(3)) {
 				otmp->cursed = 1;
 				otmp->spe = -rnd(2);
-			} else otmp->spe = rnd(2);
-		} else if(otmp->otyp == RIN_TELEPORTATION ||
-			  otmp->otyp == RIN_AGGRAVATE_MONSTER ||
-			  otmp->otyp == RIN_HUNGER || !rn2(9))
+			} else
+				otmp->spe = rnd(2);
+		} else if (otmp->otyp == RIN_TELEPORTATION ||
+			   otmp->otyp == RIN_AGGRAVATE_MONSTER ||
+			   otmp->otyp == RIN_HUNGER || !rn2(9))
 			otmp->cursed = 1;
 		break;
 	default:
 		panic("impossible mkobj");
 	}
 	otmp->owt = weight(otmp);
-	return(otmp);
+	return (otmp);
 }
 
-letter(c) {
-	return(('@' <= c && c <= 'Z') || ('a' <= c && c <= 'z'));
+int
+letter(c)
+	int c;
+{
+	return (('@' <= c && c <= 'Z') || ('a' <= c && c <= 'z'));
 }
 
+int
 weight(obj)
-register struct obj *obj;
+	struct obj     *obj;
 {
-register int wt = objects[obj->otyp].oc_weight;
-	return(wt ? wt*obj->quan : (obj->quan + 1)/2);
+	int             wt = objects[obj->otyp].oc_weight;
+	return (wt ? wt * obj->quan : (obj->quan + 1) / 2);
 }
 
-mkgold(num,x,y)
-register long num;
+void
+mkgold(num, x, y)
+	long            num;
 {
-	register struct gold *gold;
-	register long amount = (num ? num : 1 + (rnd(dlevel+2) * rnd(30)));
+	struct gold    *gold;
+	long            amount = (num ? num : 1 + (rnd(dlevel + 2) * rnd(30)));
 
-	if(gold = g_at(x,y))
+	if ((gold = g_at(x, y)) != NULL)
 		gold->amount += amount;
 	else {
 		gold = newgold();