 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -24,27 +24,27 @@
  * 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
 @@ -135,57 +135,57 @@ getcodpar(const char *s, const struct cv
 			/* 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

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -25,27 +25,27 @@
  * 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 *);

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -24,27 +24,27 @@
  * 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
 @@ -71,23 +71,23 @@ win(void)
 	/* 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,14 +1,14 @@
-/*	$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.
 @@ -24,27 +24,27 @@
  * 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, ...)
 @@ -84,27 +84,27 @@ score(void)
 		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);

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -24,27 +24,27 @@
  * 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.
 @@ -156,28 +156,28 @@ srscan(int f)
+				}
 				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));
+}