 @@ -1,302 +1,302 @@
-/*	$NetBSD: getpar.c,v 1.15 2009/05/24 23:20:22 dholland Exp $	*/
+/*	$NetBSD: getpar.c,v 1.16 2009/05/25 00:39:45 dholland Exp $	*/
 /*
  * 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
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 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. 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)getpar.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getpar.c,v 1.15 2009/05/24 23:20:22 dholland Exp $");
+__RCSID("$NetBSD: getpar.c,v 1.16 2009/05/25 00:39:45 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "getpar.h"
 #include "trek.h"
 static int testterm(void);
 /**
  **	get integer parameter
  **/
 int
 getintpar(const char *s)
+{
 	int	i;
 	int		n;
 	while (1) {
 		if (testnl() && s)
 			printf("%s: ", s);
 		i = scanf("%d", &n);
 		if (i < 0)
 			exit(1);
 		if (i > 0 && testterm())
 			return (n);
 		printf("invalid input; please enter an integer\n");
 		skiptonl(0);
+	}
+}
 /**
  **	get floating parameter
  **/
 double
 getfltpar(const char *s)
+{
 	int		i;
 	double			d;
 	while (1) {
 		if (testnl() && s)
 			printf("%s: ", s);
 		i = scanf("%lf", &d);
 		if (i < 0)
 			exit(1);
 		if (i > 0 && testterm())
 			return (d);
 		printf("invalid input; please enter a double\n");
 		skiptonl(0);
+	}
+}
 /**
  **	get yes/no parameter
  **/
 const struct cvntab	Yntab[] = {
 	{ "y",	"es",	(cmdfun)1,	1 },
 	{ "n",	"o",	(cmdfun)0,	0 },
 	{ NULL,	NULL,	NULL,		0 }
 };
 int
 getynpar(const char *s)
+{
 	const struct cvntab	*r;
 	r = getcodpar(s, Yntab);
 	return r->value2;
+}
 /**
  **	get coded parameter
  **/
 const struct cvntab *
 getcodpar(const char *s, const struct cvntab tab[])
+{
 	char				input[100];
 	const struct cvntab		*r;
 	int				flag;
 	const char			*p, *q;
 	int				c;
 	int				f;
 	flag = 0;
 	while (1) {
 		flag |= (f = testnl());
 		if (flag)
 			printf("%s: ", s);
 		if (f) {
 			/* throw out the newline */
 			getchar();
+		}
 		scanf("%*[ \t;]");
 		if ((c = scanf("%99[^ \t;\n]", input)) < 0)
 			exit(1);
 		if (c == 0)
 			continue;
 		flag = 1;
 		/* if command list, print four per line */
 		if (input[0] == '?' && input[1] == 0) {
 			c = 4;
-			for (r = tab; r->abrev; r++) {
+			for (r = tab; r->abbrev; r++) {
-				strcpy(input, r->abrev);
+				strcpy(input, r->abbrev);
 				strcat(input, r->full);
 				printf("%14.14s", input);
 				if (--c > 0)
 					continue;
 				c = 4;
 				printf("\n");
+			}
 			if (c != 4)
 				printf("\n");
 			continue;
+		}
 		/* search for in table */
-		for (r = tab; r->abrev; r++) {
+		for (r = tab; r->abbrev; r++) {
 			p = input;
-			for (q = r->abrev; *q; q++)
+			for (q = r->abbrev; *q; q++)
 				if (*p++ != *q)
 					break;
 			if (!*q) {
 				for (q = r->full; *p && *q; q++, p++)
 					if (*p != *q)
 						break;
 				if (!*p || !*q)
 					break;
+			}
+		}
 		/* check for not found */
-		if (!r->abrev) {
+		if (!r->abbrev) {
 			printf("invalid input; ? for valid inputs\n");
 			skiptonl(0);
 		} else
 			return (r);
+	}
+}
 /**
  **	get string parameter
  **/
 void
 getstrpar(const char *s, char *r, int l, const char *t)
+{
 	int	i;
 	char		format[20];
 	int	f;
 	if (t == 0)
 		t = " \t\n;";
 	(void)sprintf(format, "%%%d[^%s]", l, t);
 	while (1) {
 		if ((f = testnl()) && s)
 			printf("%s: ", s);
 		if (f)
 			getchar();
 		scanf("%*[\t ;]");
 		i = scanf(format, r);
 		if (i < 0)
 			exit(1);
 		if (i != 0)
 			return;
+	}
+}
 /**
  **	test if newline is next valid character
  **/
 int
 testnl(void)
+{
 	int c;
 	while ((c = getchar()) != '\n') {
 		if (c == EOF) {
 			exit(1);
+		}
 		if ((c >= '0' && c <= '9') || c == '.' || c == '!' ||
 		    (c >= 'A' && c <= 'Z') ||
 		    (c >= 'a' && c <= 'z') || c == '-') {
 			ungetc(c, stdin);
 			return(0);
+		}
+	}
 	ungetc(c, stdin);
 	return (1);
+}
 /**
  **	scan for newline
  **/
 void
 skiptonl(int c)
+{
 	while (c != '\n') {
 		c = getchar();
 		if (c == EOF) {
 			exit(1);
+		}
+	}
 	ungetc('\n', stdin);
 	return;
+}
 /**
  **	test for valid terminator
  **/
 static int
 testterm(void)
+{
 	int c;
 	c = getchar();
 	if (c == EOF) {
 		exit(1);
+	}
 	if (c == '.')
 		return (0);
 	if (c == '\n' || c == ';')
 		ungetc(c, stdin);
 	return (1);
+}
 /*
 **  TEST FOR SPECIFIED DELIMITER
 **
 **	The standard input is scanned for the parameter.  If found,
 **	it is thrown away and non-zero is returned.  If not found,
 **	zero is returned.
 */
 int
 readdelim(int d)
+{
 	int c;
 	while ((c = getchar()) != EOF) {
 		if (c == d)
 			return (1);
 		if (c == ' ')
 			continue;
 		ungetc(c, stdin);
 		return 0;
+	}
 	exit(1);
+}

 @@ -1,54 +1,54 @@
-/*	$NetBSD: getpar.h,v 1.11 2009/05/24 21:44:56 dholland Exp $	*/
+/*	$NetBSD: getpar.h,v 1.12 2009/05/25 00:39:45 dholland Exp $	*/
 /*
  * 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
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 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. 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)getpar.h	8.1 (Berkeley) 5/31/93
  */
 typedef void (*cmdfun)(int);
 /* used for getcodpar() parameter list */
 struct cvntab {
-	const char	*abrev;
+	const char	*abbrev;
 	const char	*full;
 	cmdfun	value;
 	int	value2;
 };
 extern const struct cvntab	Skitab[];
 extern const struct cvntab	Lentab[];
 int getintpar(const  char *);
 double getfltpar(const char *);
 int getynpar(const char *);
 const struct cvntab *getcodpar(const char *, const struct cvntab[]);
 void getstrpar(const char *, char *, int, const char *);
 int testnl(void);
 void skiptonl(int);
 int readdelim(int);

 @@ -1,93 +1,93 @@
-/*	$NetBSD: win.c,v 1.11 2009/05/24 23:00:46 dholland Exp $	*/
+/*	$NetBSD: win.c,v 1.12 2009/05/25 00:39:45 dholland Exp $	*/
 /*
  * 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
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 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. 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)win.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: win.c,v 1.11 2009/05/24 23:00:46 dholland Exp $");
+__RCSID("$NetBSD: win.c,v 1.12 2009/05/25 00:39:45 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <unistd.h>
 #include <setjmp.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  Signal game won
 **
 **	This routine prints out the win message, arranges to print out
 **	your score, tells you if you have a promotion coming to you,
 **	cleans up the current input line, and arranges to have you
 **	asked whether or not you want another game (via the longjmp()
 **	call).
 **
 **	Pretty straightforward, although the promotion algorithm is
 **	pretty off the wall.
 */
 extern jmp_buf env;
 void
 win(void)
+{
 	long		s;
 	const struct cvntab *p;
 	sleep(1);
 	printf("\nCongratulations, you have saved the Federation\n");
 	Move.endgame = 1;
 	/* print and return the score */
 	s = score();
 	/* decide if she gets a promotion */
 	if (Game.helps == 0 && Game.killb == 0 && Game.killinhab == 0 &&
 * Game.kills + Game.deaths < 100 &&
 	    s >= 1000 && Ship.ship == ENTERPRISE) {
 		printf("In fact, you are promoted one step in rank,\n");
 		if (Game.skill >= 6) {
 			printf("to the exalted rank of Commodore Emeritus\n");
 		} else {
 			p = &Skitab[Game.skill - 1];
-			printf("from %s%s ", p->abrev, p->full);
+			printf("from %s%s ", p->abbrev, p->full);
 			p++;
-			printf("to %s%s\n", p->abrev, p->full);
+			printf("to %s%s\n", p->abbrev, p->full);
+		}
+	}
 	/* clean out input, and request new game */
 	skiptonl(0);
 	longjmp(env, 1);
+}

 @@ -1,131 +1,131 @@
-/*	$NetBSD: score.c,v 1.10 2009/05/25 00:03:18 dholland Exp $	*/
+/*	$NetBSD: score.c,v 1.11 2009/05/25 00:39:45 dholland Exp $	*/
 /*
  * 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
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 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. 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: score.c,v 1.10 2009/05/25 00:03:18 dholland Exp $");
+__RCSID("$NetBSD: score.c,v 1.11 2009/05/25 00:39:45 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdarg.h>
 #include <stdio.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  PRINT OUT THE CURRENT SCORE
 */
 static void scoreitem(long amount, const char *descfmt, ...)
 	__printflike(2, 3);
 static void
 scoreitem(long amount, const char *descfmt, ...)
+{
 	va_list ap;
 	char buf[128];
 	if (amount == 0)
 		return;
 	va_start(ap, descfmt);
 	vsnprintf(buf, sizeof(buf), descfmt, ap);
 	va_end(ap);
 	printf("%-40s %10ld\n", buf, amount);
+}
 long
 score(void)
+{
 	int		u;
 	int		t;
 	long		s;
 	double		r;
 	printf("\n*** Your score:\n");
 	s = t = Param.klingpwr / 4 * (u = Game.killk);
 	scoreitem(t, "%d Klingons killed", u);
 	r = Now.date - Param.date;
 	if (r < 1.0)
 		r = 1.0;
 	r = Game.killk / r;
 	s += (t = 400 * r);
 	scoreitem(t, "Kill rate %.2f Klingons/stardate", r);
 	r = Now.klings;
 	r /= Game.killk + 1;
 	s += (t = -400 * r);
 	scoreitem(t, "Penalty for %d klingons remaining", Now.klings);
 	if (Move.endgame > 0) {
 		s += (t = 100 * (u = Game.skill));
 		scoreitem(t, "Bonus for winning a %s%s game",
-			Skitab[u - 1].abrev, Skitab[u - 1].full);
+			Skitab[u - 1].abbrev, Skitab[u - 1].full);
+	}
 	if (Game.killed) {
 		s -= 500;
 		scoreitem(-500, "Penalty for getting killed");
+	}
 	s += (t = -100 * (u = Game.killb));
 	scoreitem(t, "%d starbases killed", u);
 	s += (t = -100 * (u = Game.helps));
 	scoreitem(t, "%d calls for help", u);
 	s += (t = -5 * (u = Game.kills));
 	scoreitem(t, "%d stars destroyed", u);
 	s += (t = -150 * (u = Game.killinhab));
 	scoreitem(t, "%d inhabited starsystems destroyed", u);
 	if (Ship.ship != ENTERPRISE) {
 		s -= 200;
 		scoreitem(-200, "penalty for abandoning ship");
+	}
 	s += (t = 3 * (u = Game.captives));
 	scoreitem(t, "%d Klingons captured", u);
 	s += (t = -(u = Game.deaths));
 	scoreitem(t, "%d casualties", u);
 	printf("\n");
 	scoreitem(s, "***  TOTAL");
 	return (s);
+}

 @@ -1,183 +1,183 @@
-/*	$NetBSD: srscan.c,v 1.9 2009/05/24 22:55:03 dholland Exp $	*/
+/*	$NetBSD: srscan.c,v 1.10 2009/05/25 00:39:45 dholland Exp $	*/
 /*
  * 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
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 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. 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)srscan.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: srscan.c,v 1.9 2009/05/24 22:55:03 dholland Exp $");
+__RCSID("$NetBSD: srscan.c,v 1.10 2009/05/25 00:39:45 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  SHORT RANGE SENSOR SCAN
 **
 **	A short range scan is taken of the current quadrant.  If the
 **	flag 'f' is one, it is an "auto srscan", which is not done
 **	unless in 'fast' mode.  It does a status report and a srscan.
 **	If 'f' is -1, you get a status report only.  If it is zero,
 **	you get a srscan and an optional status report.  The status
 **	report is taken if you enter "srscan yes"; for all srscans
 **	thereafter you get a status report with your srscan until
 **	you type "srscan no".  It defaults to on.
 **
 **	The current quadrant is filled in on the computer chart.
 */
 const char	*const Color[4] = {
 	"GREEN",
 	"DOCKED",
 	"YELLOW",
 	"RED"
 };
 void
 srscan(int f)
+{
 	int		i, j;
 	int		statinfo;
 	const char	*s;
 	int		percent;
 	struct quad	*q = NULL;
 	const struct cvntab	*p;
 	if (f >= 0 && check_out(SRSCAN)) {
 		return;
+	}
 	if (f) {
 		statinfo = 1;
 	} else {
 		if (!testnl())
 			Etc.statreport = getynpar("status report");
 		statinfo = Etc.statreport;
+	}
 	if (f > 0) {
 		Etc.statreport = 1;
 		if (!Etc.fast)
 			return;
+	}
 	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++) {
 			printf("%d ", i);
+		}
 		printf("\n");
+	}
 	for (i = 0; i < NSECTS; i++) {
 		if (f >= 0) {
 			printf("%d ", i);
 			for (j = 0; j < NSECTS; j++)
 				printf("%c ", Sect[i][j]);
 			printf("%d", i);
 			if (statinfo)
 				printf("   ");
+		}
 		if (statinfo)
 			switch (i) {
 			  case 0:
 				printf("stardate      %.2f", Now.date);
 				break;
 			  case 1:
 				printf("condition     %s", Color[Ship.cond]);
 				if (Ship.cloaked)
 					printf(", CLOAKED");
 				break;
 			  case 2:
 				printf("position      %d,%d/%d,%d", Ship.quadx,
 					Ship.quady, Ship.sectx, Ship.secty);
 				break;
 			  case 3:
 				printf("warp factor   %.1f", Ship.warp);
 				break;
 			  case 4:
 				printf("total energy  %d", Ship.energy);
 				break;
 			  case 5:
 				printf("torpedoes     %d", Ship.torped);
 				break;
 			  case 6:
 				s = "down";
 				if (Ship.shldup)
 					s = "up";
 				if (damaged(SHIELD))
 					s = "damaged";
 				percent = 100.0 * Ship.shield / Param.shield;
 				printf("shields       %s, %d%%", s, percent);
 				break;
 			  case 7:
 				printf("Klingons left %d", Now.klings);
 				break;
 			  case 8:
 				printf("time left     %.2f", Now.time);
 				break;
 			  case 9:
 				printf("life support  ");
 				if (damaged(LIFESUP)) {
 					printf("damaged, reserves = %.2f",
 						Ship.reserves);
 					break;
+				}
 				printf("active");
 				break;
+			}
 		printf("\n");
+	}
 	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("  ");
 	for (i = 0; i < NSECTS; i++)
 		printf("%d ", i);
 	printf("\n");
 	if (q->qsystemname & Q_DISTRESSED)
 		printf("Distressed ");
 	if (q->qsystemname)
 		printf("Starsystem %s\n", systemname(q));
+}