WARNsify...

1 files changed, 69 insertions, 50 deletions

diff --git a/hack/hack.bones.c b/hack/hack.bones.c
index b495294c..177034a8 100644
--- a/hack/hack.bones.c
+++ b/hack/hack.bones.c
@@ -1,42 +1,50 @@
+/*	$NetBSD: hack.bones.c,v 1.4 1997/10/19 16:57:34 christos Exp $	*/
+
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char rcsid[] = "$NetBSD: hack.bones.c,v 1.3 1995/03/23 08:29:48 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.bones.c,v 1.4 1997/10/19 16:57:34 christos Exp $");
+#endif				/* not lint */
 
 #include "hack.h"
-extern char plname[PL_NSIZ];
-extern long somegold();
-extern struct monst *makemon();
-extern struct permonst pm_ghost;
+#include "extern.h"
+#include <fcntl.h>
+#include <unistd.h>
 
-char bones[] = "bones_xx";
+char            bones[] = "bones_xx";
 
 /* save bones and possessions of a deceased adventurer */
-savebones(){
-register fd;
-register struct obj *otmp;
-register struct trap *ttmp;
-register struct monst *mtmp;
-	if(dlevel <= 0 || dlevel > MAXLEVEL) return;
-	if(!rn2(1 + dlevel/2)) return;	/* not so many ghosts on low levels */
-	bones[6] = '0' + (dlevel/10);
-	bones[7] = '0' + (dlevel%10);
-	if((fd = open(bones,0)) >= 0){
+void
+savebones()
+{
+	int fd;
+	struct obj *otmp;
+	struct trap *ttmp;
+	struct monst *mtmp;
+
+	if (dlevel <= 0 || dlevel > MAXLEVEL)
+		return;
+	if (!rn2(1 + dlevel / 2))
+		return;		/* not so many ghosts on low levels */
+	bones[6] = '0' + (dlevel / 10);
+	bones[7] = '0' + (dlevel % 10);
+	if ((fd = open(bones, 0)) >= 0) {
 		(void) close(fd);
 		return;
 	}
 	/* drop everything; the corpse's possessions are usually cursed */
 	otmp = invent;
-	while(otmp){
+	while (otmp) {
 		otmp->ox = u.ux;
 		otmp->oy = u.uy;
-		otmp->age = 0;		/* very long ago */
+		otmp->age = 0;	/* very long ago */
 		otmp->owornmask = 0;
-		if(rn2(5)) otmp->cursed = 1;
-		if(!otmp->nobj){
+		if (rn2(5))
+			otmp->cursed = 1;
+		if (!otmp->nobj) {
 			otmp->nobj = fobj;
 			fobj = invent;
 			invent = 0;	/* superfluous */
@@ -44,57 +52,68 @@ register struct monst *mtmp;
 		}
 		otmp = otmp->nobj;
 	}
-	if(!(mtmp = makemon(PM_GHOST, u.ux, u.uy))) return;
+	if (!(mtmp = makemon(PM_GHOST, u.ux, u.uy)))
+		return;
 	mtmp->mx = u.ux;
 	mtmp->my = u.uy;
 	mtmp->msleep = 1;
 	(void) strcpy((char *) mtmp->mextra, plname);
-	mkgold(somegold() + d(dlevel,30), u.ux, u.uy);
-	for(mtmp = fmon; mtmp; mtmp = mtmp->nmon){
+	mkgold(somegold() + d(dlevel, 30), u.ux, u.uy);
+	for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) {
 		mtmp->m_id = 0;
-		if(mtmp->mtame) {
+		if (mtmp->mtame) {
 			mtmp->mtame = 0;
 			mtmp->mpeaceful = 0;
 		}
 		mtmp->mlstmv = 0;
-		if(mtmp->mdispl) unpmon(mtmp);
+		if (mtmp->mdispl)
+			unpmon(mtmp);
 	}
-	for(ttmp = ftrap; ttmp; ttmp = ttmp->ntrap)
+	for (ttmp = ftrap; ttmp; ttmp = ttmp->ntrap)
 		ttmp->tseen = 0;
-	for(otmp = fobj; otmp; otmp = otmp->nobj) {
+	for (otmp = fobj; otmp; otmp = otmp->nobj) {
 		otmp->o_id = 0;
-	     /* otmp->o_cnt_id = 0; - superfluous */
+		/* otmp->o_cnt_id = 0; - superfluous */
 		otmp->onamelth = 0;
 		otmp->known = 0;
 		otmp->invlet = 0;
-		if(otmp->olet == AMULET_SYM && !otmp->spe) {
-			otmp->spe = -1;      /* no longer the actual amulet */
-			otmp->cursed = 1;    /* flag as gotten from a ghost */
+		if (otmp->olet == AMULET_SYM && !otmp->spe) {
+			otmp->spe = -1;	/* no longer the actual amulet */
+			otmp->cursed = 1;	/* flag as gotten from a
+						 * ghost */
 		}
 	}
-	if((fd = creat(bones, FMASK)) < 0) return;
-	savelev(fd,dlevel);
+	if ((fd = creat(bones, FMASK)) < 0)
+		return;
+	savelev(fd, dlevel);
 	(void) close(fd);
 }
 
-getbones(){
-register fd,x,y,ok;
-	if(rn2(3)) return(0);	/* only once in three times do we find bones */
-	bones[6] = '0' + dlevel/10;
-	bones[7] = '0' + dlevel%10;
-	if((fd = open(bones, 0)) < 0) return(0);
-	if((ok = uptodate(fd)) != 0){
+int
+getbones()
+{
+	int fd, x, y, ok;
+
+	if (rn2(3))
+		return (0);	/* only once in three times do we find bones */
+	bones[6] = '0' + dlevel / 10;
+	bones[7] = '0' + dlevel % 10;
+	if ((fd = open(bones, 0)) < 0)
+		return (0);
+	if ((ok = uptodate(fd)) != 0) {
 		getlev(fd, 0, dlevel);
-		for(x = 0; x < COLNO; x++) for(y = 0; y < ROWNO; y++)
-			levl[x][y].seen = levl[x][y].new = 0;
+		for (x = 0; x < COLNO; x++)
+			for (y = 0; y < ROWNO; y++)
+				levl[x][y].seen = levl[x][y].new = 0;
 	}
 	(void) close(fd);
 #ifdef WIZARD
-	if(!wizard)	/* duvel!frans: don't remove bones while debugging */
-#endif WiZARD
-	    if(unlink(bones) < 0){
-		pline("Cannot unlink %s .", bones);
-		return(0);
-	}
-	return(ok);
+	if (!wizard)		/* duvel!frans: don't remove bones while
+				 * debugging */
+#endif	/* WiZARD */
+		if (unlink(bones) < 0) {
+			pline("Cannot unlink %s .", bones);
+			return (0);
+		}
+	return (ok);
 }