diff srogue/rip.c @ 300:0250220d8cdd

Fix an assortment of compiler warnings. A few potential bugs were removed in the process. Much code cleanup remains to be done.
author John "Elwin" Edwards
date Fri, 22 Nov 2019 21:18:27 -0500
parents 70aa5808c782
children e52a8a7ad4c5
line wrap: on
line diff
--- a/srogue/rip.c	Sun Feb 11 15:37:33 2018 -0500
+++ b/srogue/rip.c	Fri Nov 22 21:18:27 2019 -0500
@@ -63,7 +63,8 @@
 void
 death(char monst)
 {
-	reg char dp, *killer;
+	reg char *killer;
+	int dp;
 	struct tm *lt;
 	time_t date;
 	char buf[LINLEN];
@@ -180,21 +181,21 @@
 		for (scp = top_ten; scp <= &top_ten[9]; scp++)
 			if (amount > scp->sc_score)
 				break;
-			if (scp <= &top_ten[9]) {
-				for (sc2 = &top_ten[9]; sc2 > scp; sc2--)
-					*sc2 = *(sc2-1);
-				scp->sc_score = amount;
-				strcpy(scp->sc_name, whoami);
-				scp->sc_flags = aflag;
-				if (aflag == WINNER)
-					scp->sc_level = max_level;
-				else
-					scp->sc_level = level;
-				scp->sc_monster = monst;
-				scp->sc_uid = playuid;
-				scp->sc_explvl = him->s_lvl;
-				scp->sc_exppts = him->s_exp;
-				time(&scp->sc_date);
+		if (scp <= &top_ten[9]) {
+			for (sc2 = &top_ten[9]; sc2 > scp; sc2--)
+				*sc2 = *(sc2-1);
+			scp->sc_score = amount;
+			strcpy(scp->sc_name, whoami);
+			scp->sc_flags = aflag;
+			if (aflag == WINNER)
+				scp->sc_level = max_level;
+			else
+				scp->sc_level = level;
+			scp->sc_monster = monst;
+			scp->sc_uid = playuid;
+			scp->sc_explvl = him->s_lvl;
+			scp->sc_exppts = him->s_exp;
+			time(&scp->sc_date);
 		}
 	}
 	ignore();
@@ -228,7 +229,7 @@
 #ifdef LOGFILE
 	if (logfile == NULL)
 		return;
-	sprintf(logmessage, "%d %d %s %d ", time(NULL), amount, whoami,
+	sprintf(logmessage, "%ld %d %s %d ", time(NULL), amount, whoami,
 		him->s_lvl);
 	if (amulet)
 		sprintf(mlev, " [max %d] with the Amulet", max_level);