Make "rogue" build with "WARNS=2". The necessary patches were supplied

by David A. Holland in PR bin/17498.

4 files changed, 17 insertions, 16 deletions

diff --git a/rogue/Makefile b/rogue/Makefile
index 8c24714f..0e64c94e 100644
--- a/rogue/Makefile
+++ b/rogue/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 1999/09/13 17:14:07 jsm Exp $
+#	$NetBSD: Makefile,v 1.15 2002/07/07 09:35:07 tron Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	rogue
@@ -11,6 +11,7 @@ LDADD=	-lcurses
 HIDEGAME=hidegame
 SETGIDGAME=yes
 MAN=	rogue.6
+WARNS=	2
 
 .if make(install)
 SUBDIR+=USD.doc
diff --git a/rogue/hit.c b/rogue/hit.c
index 5ad19e66..a0c69f90 100644
--- a/rogue/hit.c
+++ b/rogue/hit.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hit.c,v 1.5 1998/11/10 13:01:31 hubertf Exp $	*/
+/*	$NetBSD: hit.c,v 1.6 2002/07/07 09:35:07 tron Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)hit.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: hit.c,v 1.5 1998/11/10 13:01:31 hubertf Exp $");
+__RCSID("$NetBSD: hit.c,v 1.6 2002/07/07 09:35:07 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -213,17 +213,17 @@ get_w_damage(obj)
 	const object *obj;
 {
 	char new_damage[12];
-	int to_hit, damage;
+	int tmp_to_hit, tmp_damage;
 	int i = 0;
 
 	if ((!obj) || (obj->what_is != WEAPON)) {
 		return(-1);
 	}
-	to_hit = get_number(obj->damage) + obj->hit_enchant;
+	tmp_to_hit = get_number(obj->damage) + obj->hit_enchant;
 	while (obj->damage[i++] != 'd') ;
-	damage = get_number(obj->damage + i) + obj->d_enchant;
+	tmp_damage = get_number(obj->damage + i) + obj->d_enchant;
 
-	sprintf(new_damage, "%dd%d", to_hit, damage);
+	sprintf(new_damage, "%dd%d", tmp_to_hit, tmp_damage);
 
 	return(get_damage(new_damage, 1));
 }
diff --git a/rogue/inventory.c b/rogue/inventory.c
index c68f2c34..1293765d 100644
--- a/rogue/inventory.c
+++ b/rogue/inventory.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inventory.c,v 1.6 1998/11/10 13:01:32 hubertf Exp $	*/
+/*	$NetBSD: inventory.c,v 1.7 2002/07/07 09:35:08 tron Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)inventory.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: inventory.c,v 1.6 1998/11/10 13:01:32 hubertf Exp $");
+__RCSID("$NetBSD: inventory.c,v 1.7 2002/07/07 09:35:08 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -362,15 +362,15 @@ pr_com_id(ch)
 }
 
 int
-get_com_id(index, ch)
-	int *index;
+get_com_id(indexp, ch)
+	int *indexp;
 	short ch;
 {
 	short i;
 
 	for (i = 0; i < COMS; i++) {
 		if (com_id_tab[i].com_char == ch) {
-			*index = i;
+			*indexp = i;
 			return(1);
 		}
 	}
diff --git a/rogue/score.c b/rogue/score.c
index e0f64592..73d34d9e 100644
--- a/rogue/score.c
+++ b/rogue/score.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: score.c,v 1.9 2001/08/09 13:02:49 wiz Exp $	*/
+/*	$NetBSD: score.c,v 1.10 2002/07/07 09:35:08 tron Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: score.c,v 1.9 2001/08/09 13:02:49 wiz Exp $");
+__RCSID("$NetBSD: score.c,v 1.10 2002/07/07 09:35:08 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -209,7 +209,7 @@ put_scores(monster, other)
 	char buf[128];
 	FILE *fp;
 	long s;
-	boolean pause = score_only;
+	boolean dopause = score_only;
 
 	md_lock(1);
 
@@ -322,7 +322,7 @@ put_scores(monster, other)
 	refresh();
 	fclose(fp);
 	message("", 0);
-	if (pause) {
+	if (dopause) {
 		message("", 0);
 	}
 	clean_up("");