WARNsify...

1 files changed, 192 insertions, 157 deletions

diff --git a/hack/hack.engrave.c b/hack/hack.engrave.c
index e32807d3..8261967f 100644
--- a/hack/hack.engrave.c
+++ b/hack/hack.engrave.c
@@ -1,275 +1,303 @@
+/*	$NetBSD: hack.engrave.c,v 1.4 1997/10/19 16:57:58 christos Exp $	*/
+
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char rcsid[] = "$NetBSD: hack.engrave.c,v 1.3 1995/03/23 08:30:08 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.engrave.c,v 1.4 1997/10/19 16:57:58 christos Exp $");
+#endif				/* not lint */
 
-#include	"hack.h"
+#include <stdlib.h>
+#include "hack.h"
+#include "extern.h"
 
-extern char *nomovemsg;
-extern char nul[];
-extern struct obj zeroobj;
 struct engr {
-	struct engr *nxt_engr;
-	char *engr_txt;
-	xchar engr_x, engr_y;
-	unsigned engr_lth;	/* for save & restore; not length of text */
-	long engr_time;	/* moment engraving was (will be) finished */
-	xchar engr_type;
+	struct engr    *nxt_engr;
+	char           *engr_txt;
+	xchar           engr_x, engr_y;
+	unsigned        engr_lth;	/* for save & restore; not length of
+					 * text */
+	long            engr_time;	/* moment engraving was (will be)
+					 * finished */
+	xchar           engr_type;
 #define	DUST	1
 #define	ENGRAVE	2
 #define	BURN	3
-} *head_engr;
+}              *head_engr;
 
-struct engr *
-engr_at(x,y) register xchar x,y; {
-register struct engr *ep = head_engr;
-	while(ep) {
-		if(x == ep->engr_x && y == ep->engr_y)
-			return(ep);
+struct engr    *
+engr_at(x, y)
+	xchar           x, y;
+{
+	struct engr    *ep = head_engr;
+	while (ep) {
+		if (x == ep->engr_x && y == ep->engr_y)
+			return (ep);
 		ep = ep->nxt_engr;
 	}
-	return((struct engr *) 0);
+	return ((struct engr *) 0);
 }
 
-sengr_at(s,x,y) register char *s; register xchar x,y; {
-register struct engr *ep = engr_at(x,y);
-register char *t;
-register int n;
-	if(ep && ep->engr_time <= moves) {
+int
+sengr_at(s, x, y)
+	char           *s;
+	xchar           x, y;
+{
+	struct engr    *ep = engr_at(x, y);
+	char           *t;
+	int             n;
+	if (ep && ep->engr_time <= moves) {
 		t = ep->engr_txt;
-/*
-		if(!strcmp(s,t)) return(1);
-*/
+		/*
+				if(!strcmp(s,t)) return(1);
+		*/
 		n = strlen(s);
-		while(*t) {
-			if(!strncmp(s,t,n)) return(1);
+		while (*t) {
+			if (!strncmp(s, t, n))
+				return (1);
 			t++;
 		}
 	}
-	return(0);
+	return (0);
 }
 
+void
 u_wipe_engr(cnt)
-register int cnt;
+	int             cnt;
 {
-	if(!u.uswallow && !Levitation)
+	if (!u.uswallow && !Levitation)
 		wipe_engr_at(u.ux, u.uy, cnt);
 }
 
-wipe_engr_at(x,y,cnt) register xchar x,y,cnt; {
-register struct engr *ep = engr_at(x,y);
-register int lth,pos;
-char ch;
-	if(ep){
-		if((ep->engr_type != DUST) || Levitation) {
-			cnt = rn2(1 + 50/(cnt+1)) ? 0 : 1;
+void
+wipe_engr_at(x, y, cnt)
+	xchar           x, y, cnt;
+{
+	struct engr    *ep = engr_at(x, y);
+	int             lth, pos;
+	char            ch;
+	if (ep) {
+		if ((ep->engr_type != DUST) || Levitation) {
+			cnt = rn2(1 + 50 / (cnt + 1)) ? 0 : 1;
 		}
 		lth = strlen(ep->engr_txt);
-		if(lth && cnt > 0 ) {
-			while(cnt--) {
+		if (lth && cnt > 0) {
+			while (cnt--) {
 				pos = rn2(lth);
-				if((ch = ep->engr_txt[pos]) == ' ')
+				if ((ch = ep->engr_txt[pos]) == ' ')
 					continue;
 				ep->engr_txt[pos] = (ch != '?') ? '?' : ' ';
 			}
 		}
-		while(lth && ep->engr_txt[lth-1] == ' ')
+		while (lth && ep->engr_txt[lth - 1] == ' ')
 			ep->engr_txt[--lth] = 0;
-		while(ep->engr_txt[0] == ' ')
+		while (ep->engr_txt[0] == ' ')
 			ep->engr_txt++;
-		if(!ep->engr_txt[0]) del_engr(ep);
+		if (!ep->engr_txt[0])
+			del_engr(ep);
 	}
 }
 
-read_engr_at(x,y) register int x,y; {
-register struct engr *ep = engr_at(x,y);
-	if(ep && ep->engr_txt[0]) {
-	    switch(ep->engr_type) {
-	    case DUST:
-		pline("Something is written here in the dust.");
-		break;
-	    case ENGRAVE:
-		pline("Something is engraved here on the floor.");
-		break;
-	    case BURN:
-		pline("Some text has been burned here in the floor.");
-		break;
-	    default:
-		impossible("Something is written in a very strange way.");
-	    }
-	    pline("You read: \"%s\".", ep->engr_txt);
+void
+read_engr_at(x, y)
+	int             x, y;
+{
+	struct engr    *ep = engr_at(x, y);
+	if (ep && ep->engr_txt[0]) {
+		switch (ep->engr_type) {
+		case DUST:
+			pline("Something is written here in the dust.");
+			break;
+		case ENGRAVE:
+			pline("Something is engraved here on the floor.");
+			break;
+		case BURN:
+			pline("Some text has been burned here in the floor.");
+			break;
+		default:
+			impossible("Something is written in a very strange way.");
+		}
+		pline("You read: \"%s\".", ep->engr_txt);
 	}
 }
 
-make_engr_at(x,y,s)
-register int x,y;
-register char *s;
+void
+make_engr_at(x, y, s)
+	int             x, y;
+	char           *s;
 {
-	register struct engr *ep;
+	struct engr    *ep;
 
-	if(ep = engr_at(x,y))
-	    del_engr(ep);
+	if ((ep = engr_at(x, y)) != NULL)
+		del_engr(ep);
 	ep = (struct engr *)
-	    alloc((unsigned)(sizeof(struct engr) + strlen(s) + 1));
+		alloc((unsigned) (sizeof(struct engr) + strlen(s) + 1));
 	ep->nxt_engr = head_engr;
 	head_engr = ep;
 	ep->engr_x = x;
 	ep->engr_y = y;
-	ep->engr_txt = (char *)(ep + 1);
+	ep->engr_txt = (char *) (ep + 1);
 	(void) strcpy(ep->engr_txt, s);
 	ep->engr_time = 0;
 	ep->engr_type = DUST;
 	ep->engr_lth = strlen(s) + 1;
 }
 
-doengrave(){
-register int len;
-register char *sp;
-register struct engr *ep, *oep = engr_at(u.ux,u.uy);
-char buf[BUFSZ];
-xchar type;
-int spct;		/* number of leading spaces */
-register struct obj *otmp;
+int
+doengrave()
+{
+	int             len;
+	char           *sp;
+	struct engr    *ep, *oep = engr_at(u.ux, u.uy);
+	char            buf[BUFSZ];
+	xchar           type;
+	int             spct;	/* number of leading spaces */
+	struct obj     *otmp;
 	multi = 0;
 
-	if(u.uswallow) {
+	if (u.uswallow) {
 		pline("You're joking. Hahaha!");	/* riv05!a3 */
-		return(0);
+		return (0);
 	}
-
 	/* one may write with finger, weapon or wand */
 	otmp = getobj("#-)/", "write with");
-	if(!otmp) return(0);
+	if (!otmp)
+		return (0);
 
-	if(otmp == &zeroobj)
+	if (otmp == &zeroobj)
 		otmp = 0;
-	if(otmp && otmp->otyp == WAN_FIRE && otmp->spe) {
+	if (otmp && otmp->otyp == WAN_FIRE && otmp->spe) {
 		type = BURN;
 		otmp->spe--;
 	} else {
 		/* first wield otmp */
-		if(otmp != uwep) {
-			if(uwep && uwep->cursed) {
-			    /* Andreas Bormann */
-			    pline("Since your weapon is welded to your hand,");
-			    pline("you use the %s.", aobjnam(uwep, (char *) 0));
-			    otmp = uwep;
+		if (otmp != uwep) {
+			if (uwep && uwep->cursed) {
+				/* Andreas Bormann */
+				pline("Since your weapon is welded to your hand,");
+				pline("you use the %s.", aobjnam(uwep, (char *) 0));
+				otmp = uwep;
 			} else {
-			    if(!otmp)
-				pline("You are now empty-handed.");
-			    else if(otmp->cursed)
-				pline("The %s %s to your hand!",
-				    aobjnam(otmp, "weld"),
-				    (otmp->quan == 1) ? "itself" : "themselves");
-			    else
-				pline("You now wield %s.", doname(otmp));
-			    setuwep(otmp);
+				if (!otmp)
+					pline("You are now empty-handed.");
+				else if (otmp->cursed)
+					pline("The %s %s to your hand!",
+					      aobjnam(otmp, "weld"),
+					      (otmp->quan == 1) ? "itself" : "themselves");
+				else
+					pline("You now wield %s.", doname(otmp));
+				setuwep(otmp);
 			}
 		}
-
-		if(!otmp)
+		if (!otmp)
 			type = DUST;
-		else
-		if(otmp->otyp == DAGGER || otmp->otyp == TWO_HANDED_SWORD ||
-		otmp->otyp == CRYSKNIFE ||
-		otmp->otyp == LONG_SWORD || otmp->otyp == AXE) {
+		else if (otmp->otyp == DAGGER || otmp->otyp == TWO_HANDED_SWORD ||
+			 otmp->otyp == CRYSKNIFE ||
+			 otmp->otyp == LONG_SWORD || otmp->otyp == AXE) {
 			type = ENGRAVE;
-			if((int)otmp->spe <= -3) {
+			if ((int) otmp->spe <= -3) {
 				type = DUST;
 				pline("Your %s too dull for engraving.",
-					aobjnam(otmp, "are"));
-				if(oep && oep->engr_type != DUST) return(1);
+				      aobjnam(otmp, "are"));
+				if (oep && oep->engr_type != DUST)
+					return (1);
 			}
-		} else	type = DUST;
+		} else
+			type = DUST;
 	}
-	if(Levitation && type != BURN){		/* riv05!a3 */
+	if (Levitation && type != BURN) {	/* riv05!a3 */
 		pline("You can't reach the floor!");
-		return(1);
+		return (1);
 	}
-	if(oep && oep->engr_type == DUST){
-		  pline("You wipe out the message that was written here.");
-		  del_engr(oep);
-		  oep = 0;
+	if (oep && oep->engr_type == DUST) {
+		pline("You wipe out the message that was written here.");
+		del_engr(oep);
+		oep = 0;
 	}
-	if(type == DUST && oep){
-	pline("You cannot wipe out the message that is %s in the rock.",
-		    (oep->engr_type == BURN) ? "burned" : "engraved");
-		  return(1);
+	if (type == DUST && oep) {
+		pline("You cannot wipe out the message that is %s in the rock.",
+		      (oep->engr_type == BURN) ? "burned" : "engraved");
+		return (1);
 	}
-
 	pline("What do you want to %s on the floor here? ",
-	  (type == ENGRAVE) ? "engrave" : (type == BURN) ? "burn" : "write");
+	 (type == ENGRAVE) ? "engrave" : (type == BURN) ? "burn" : "write");
 	getlin(buf);
 	clrlin();
 	spct = 0;
 	sp = buf;
-	while(*sp == ' ') spct++, sp++;
+	while (*sp == ' ')
+		spct++, sp++;
 	len = strlen(sp);
-	if(!len || *buf == '\033') {
-		if(type == BURN) otmp->spe++;
-		return(0);
+	if (!len || *buf == '\033') {
+		if (type == BURN)
+			otmp->spe++;
+		return (0);
 	}
-	
-	switch(type) {
+	switch (type) {
 	case DUST:
 	case BURN:
-		if(len > 15) {
-			multi = -(len/10);
+		if (len > 15) {
+			multi = -(len / 10);
 			nomovemsg = "You finished writing.";
 		}
 		break;
 	case ENGRAVE:		/* here otmp != 0 */
-		{	int len2 = (otmp->spe + 3) * 2 + 1;
+		{
+			int             len2 = (otmp->spe + 3) * 2 + 1;
 
 			pline("Your %s dull.", aobjnam(otmp, "get"));
-			if(len2 < len) {
+			if (len2 < len) {
 				len = len2;
 				sp[len] = 0;
 				otmp->spe = -3;
 				nomovemsg = "You cannot engrave more.";
 			} else {
-				otmp->spe -= len/2;
+				otmp->spe -= len / 2;
 				nomovemsg = "You finished engraving.";
 			}
 			multi = -len;
 		}
 		break;
 	}
-	if(oep) len += strlen(oep->engr_txt) + spct;
-	ep = (struct engr *) alloc((unsigned)(sizeof(struct engr) + len + 1));
+	if (oep)
+		len += strlen(oep->engr_txt) + spct;
+	ep = (struct engr *) alloc((unsigned) (sizeof(struct engr) + len + 1));
 	ep->nxt_engr = head_engr;
 	head_engr = ep;
 	ep->engr_x = u.ux;
 	ep->engr_y = u.uy;
-	sp = (char *)(ep + 1);	/* (char *)ep + sizeof(struct engr) */
+	sp = (char *) (ep + 1);	/* (char *)ep + sizeof(struct engr) */
 	ep->engr_txt = sp;
-	if(oep) {
+	if (oep) {
 		(void) strcpy(sp, oep->engr_txt);
 		(void) strcat(sp, buf);
 		del_engr(oep);
 	} else
 		(void) strcpy(sp, buf);
-	ep->engr_lth = len+1;
+	ep->engr_lth = len + 1;
 	ep->engr_type = type;
-	ep->engr_time = moves-multi;
+	ep->engr_time = moves - multi;
 
 	/* kludge to protect pline against excessively long texts */
-	if(len > BUFSZ-20) sp[BUFSZ-20] = 0;
+	if (len > BUFSZ - 20)
+		sp[BUFSZ - 20] = 0;
 
-	return(1);
+	return (1);
 }
 
-save_engravings(fd) int fd; {
-register struct engr *ep = head_engr;
-	while(ep) {
-		if(!ep->engr_lth || !ep->engr_txt[0]){
+void
+save_engravings(fd)
+	int             fd;
+{
+	struct engr    *ep = head_engr;
+	while (ep) {
+		if (!ep->engr_lth || !ep->engr_txt[0]) {
 			ep = ep->nxt_engr;
 			continue;
 		}
-		bwrite(fd, (char *) & (ep->engr_lth), sizeof(ep->engr_lth));
+		bwrite(fd, (char *) &(ep->engr_lth), sizeof(ep->engr_lth));
 		bwrite(fd, (char *) ep, sizeof(struct engr) + ep->engr_lth);
 		ep = ep->nxt_engr;
 	}
@@ -277,13 +305,17 @@ register struct engr *ep = head_engr;
 	head_engr = 0;
 }
 
-rest_engravings(fd) int fd; {
-register struct engr *ep;
-unsigned lth;
+void
+rest_engravings(fd)
+	int             fd;
+{
+	struct engr    *ep;
+	unsigned        lth;
 	head_engr = 0;
-	while(1) {
+	while (1) {
 		mread(fd, (char *) &lth, sizeof(unsigned));
-		if(lth == 0) return;
+		if (lth == 0)
+			return;
 		ep = (struct engr *) alloc(sizeof(struct engr) + lth);
 		mread(fd, (char *) ep, sizeof(struct engr) + lth);
 		ep->nxt_engr = head_engr;
@@ -292,20 +324,23 @@ unsigned lth;
 	}
 }
 
-del_engr(ep) register struct engr *ep; {
-register struct engr *ept;
-	if(ep == head_engr)
+void
+del_engr(ep)
+	struct engr    *ep;
+{
+	struct engr    *ept;
+	if (ep == head_engr)
 		head_engr = ep->nxt_engr;
 	else {
-		for(ept = head_engr; ept; ept = ept->nxt_engr) {
-			if(ept->nxt_engr == ep) {
+		for (ept = head_engr; ept; ept = ept->nxt_engr) {
+			if (ept->nxt_engr == ep) {
 				ept->nxt_engr = ep->nxt_engr;
 				goto fnd;
 			}
 		}
 		impossible("Error in del_engr?");
 		return;
-	fnd:	;
+fnd:		;
 	}
 	free((char *) ep);
 }