From 4c39d3d5d3a9a029eecd375d4c55d91ed234cc9c Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Mon, 28 Jan 2008 03:23:29 +0000
Subject: clean for WARNS=4

---
 hunt/huntd/driver.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'hunt/huntd/driver.c')

diff --git a/hunt/huntd/driver.c b/hunt/huntd/driver.c
index 515e4d6d..f2c46789 100644
--- a/hunt/huntd/driver.c
+++ b/hunt/huntd/driver.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: driver.c,v 1.12 2006/10/07 17:27:57 elad Exp $	*/
+/*	$NetBSD: driver.c,v 1.13 2008/01/28 03:23:29 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: driver.c,v 1.12 2006/10/07 17:27:57 elad Exp $");
+__RCSID("$NetBSD: driver.c,v 1.13 2008/01/28 03:23:29 dholland Exp $");
 #endif /* not lint */
 
 # include	<sys/ioctl.h>
@@ -464,18 +464,18 @@ makeboots()
  *	Check the damage to the given player, and see if s/he is killed
  */
 void
-checkdam(ouch, gotcha, credit, amt, shot_type)
+checkdam(ouch, gotcha, credit, amt, this_shot_type)
 	PLAYER	*ouch, *gotcha;
 	IDENT	*credit;
 	int	amt;
-	char	shot_type;
+	char	this_shot_type;
 {
-	char	*cp;
+	const char	*cp;
 
 	if (ouch->p_death[0] != '\0')
 		return;
 # ifdef BOOTS
-	if (shot_type == SLIME)
+	if (this_shot_type == SLIME)
 		switch (ouch->p_nboots) {
 		  default:
 			break;
@@ -497,7 +497,7 @@ checkdam(ouch, gotcha, credit, amt, shot_type)
 	}
 
 	/* Someone DIED */
-	switch (shot_type) {
+	switch (this_shot_type) {
 	  default:
 		cp = "Killed";
 		break;
@@ -542,7 +542,7 @@ checkdam(ouch, gotcha, credit, amt, shot_type)
 	}
 	if (credit == NULL) {
 		(void) sprintf(ouch->p_death, "| %s by %s |", cp,
-			(shot_type == MINE || shot_type == GMINE) ?
+			(this_shot_type == MINE || this_shot_type == GMINE) ?
 			"a mine" : "act of God");
 		return;
 	}
-- 
cgit v1.2.3