X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/462fca95471224f85b85be911e72faee16cd1597..a91067b8ba82b43d07c7888f04b5d641a509561c:/trek/srscan.c

diff --git a/trek/srscan.c b/trek/srscan.c
index b99798e8..64c6d290 100644
--- a/trek/srscan.c
+++ b/trek/srscan.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: srscan.c,v 1.11 2009/08/12 08:54:54 dholland Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,13 +29,18 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)srscan.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: srscan.c,v 1.2 1993/08/01 18:49:56 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)srscan.c	8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: srscan.c,v 1.11 2009/08/12 08:54:54 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include	"trek.h"
-# include	"getpar.h"
+#include <stdio.h>
+#include "trek.h"
+#include "getpar.h"
 
 /*
 **  SHORT RANGE SENSOR SCAN
@@ -54,61 +57,51 @@ static char rcsid[] = "$Id: srscan.c,v 1.2 1993/08/01 18:49:56 mycroft Exp $";
 **	The current quadrant is filled in on the computer chart.
 */
 
-char	*Color[4] =
-{
+static const char *const Color[4] = {
 	"GREEN",
 	"DOCKED",
 	"YELLOW",
 	"RED"
 };
 
-srscan(f)
-int	f;
+void
+srscan(int f)
 {
-	register int		i, j;
-	register int		statinfo;
-	char			*s;
-	int			percent;
-	struct quad		*q;
-	extern struct cvntab	Skitab[];
-	extern struct cvntab	Lentab[];
-	struct cvntab		*p;
+	int		i, j;
+	int		statinfo;
+	const char	*s;
+	int		percent;
+	struct quad	*q = NULL;
+	const struct cvntab	*p;
 
-	if (f >= 0 && check_out(SRSCAN))
-	{
+	if (f >= 0 && check_out(SRSCAN)) {
 		return;
 	}
-	if (f)
+	if (f) {
 		statinfo = 1;
-	else
-	{
+	} else {
 		if (!testnl())
 			Etc.statreport = getynpar("status report");
 		statinfo = Etc.statreport;
 	}
-	if (f > 0)
-	{
+	if (f > 0) {
 		Etc.statreport = 1;
 		if (!Etc.fast)
 			return;
 	}
-	if (f >= 0)
-	{
+	if (f >= 0) {
 		printf("\nShort range sensor scan\n");
 		q = &Quad[Ship.quadx][Ship.quady];
 		q->scanned = q->klings * 100 + q->bases * 10 + q->stars;
 		printf("  ");
-		for (i = 0; i < NSECTS; i++)
-		{
+		for (i = 0; i < NSECTS; i++) {
 			printf("%d ", i);
 		}
 		printf("\n");
 	}
 
-	for (i = 0; i < NSECTS; i++)
-	{
-		if (f >= 0)
-		{
+	for (i = 0; i < NSECTS; i++) {
+		if (f >= 0) {
 			printf("%d ", i);
 			for (j = 0; j < NSECTS; j++)
 				printf("%c ", Sect[i][j]);
@@ -117,8 +110,7 @@ int	f;
 				printf("   ");
 		}
 		if (statinfo)
-			switch (i)
-			{
+			switch (i) {
 			  case 0:
 				printf("stardate      %.2f", Now.date);
 				break;
@@ -128,7 +120,8 @@ int	f;
 					printf(", CLOAKED");
 				break;
 			  case 2:
-				printf("position      %d,%d/%d,%d",Ship.quadx, Ship.quady, Ship.sectx, Ship.secty);
+				printf("position      %d,%d/%d,%d", Ship.quadx,
+					Ship.quady, Ship.sectx, Ship.secty);
 				break;
 			  case 3:
 				printf("warp factor   %.1f", Ship.warp);
@@ -156,9 +149,9 @@ int	f;
 				break;
 			  case 9:
 				printf("life support  ");
-				if (damaged(LIFESUP))
-				{
-					printf("damaged, reserves = %.2f", Ship.reserves);
+				if (damaged(LIFESUP)) {
+					printf("damaged, reserves = %.2f",
+						Ship.reserves);
 					break;
 				}
 				printf("active");
@@ -166,17 +159,16 @@ int	f;
 			}
 		printf("\n");
 	}
-	if (f < 0)
-	{
+	if (f < 0) {
 		printf("current crew  %d\n", Ship.crew);
 		printf("brig space    %d\n", Ship.brigfree);
 		printf("Klingon power %d\n", Param.klingpwr);
 		p = &Lentab[Game.length - 1];
 		if (Game.length > 2)
 			p--;
-		printf("Length, Skill %s%s, ", p->abrev, p->full);
+		printf("Length, Skill %s%s, ", p->abbrev, p->full);
 		p = &Skitab[Game.skill - 1];
-		printf("%s%s\n", p->abrev, p->full);
+		printf("%s%s\n", p->abbrev, p->full);
 		return;
 	}
 	printf("  ");