 @@ -1,14 +1,14 @@
-/*	$NetBSD: abandon.c,v 1.8 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: abandon.c,v 1.9 2009/05/24 21:44:56 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[] = "@(#)abandon.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: abandon.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: abandon.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 /*
 **  Abandon Ship
 **
 **	The ship is abandoned.  If your current ship is the Faire
 **	Queene, or if your shuttlecraft is dead, you're out of
 **	luck.  You need the shuttlecraft in order for the captain
 **	(that's you!!) to escape.
 @@ -69,99 +69,89 @@ __RCSID("$NetBSD: abandon.c,v 1.8 2009/0
 /*ARGSUSED*/
 void
 abandon(int v __unused)
+{
 	struct quad	*q;
 	int		i;
 	int		j;
 	struct event	*e;
 	if (Ship.ship == QUEENE) {
 		printf("You may not abandon ye Faire Queene\n");
 		return;
+	}
-	if (Ship.cond != DOCKED)
+	if (Ship.cond != DOCKED) {
 		if (damaged(SHUTTLE)) {
 			out(SHUTTLE);
 			return;
+		}
 		printf("Officers escape in shuttlecraft\n");
 		/* decide on fate of crew */
 		q = &Quad[Ship.quadx][Ship.quady];
-		if (q->qsystemname == 0 || damaged(XPORTER))
+		if (q->qsystemname == 0 || damaged(XPORTER)) {
 			printf("Entire crew of %d left to die in outer space\n",
 				Ship.crew);
 			Game.deaths += Ship.crew;
 		} else {
 		else
 			printf("Crew beams down to planet %s\n", systemname(q));
+		}
+	}
 	/* see if you can be exchanged */
 	if (Now.bases == 0 || Game.captives < 20 * Game.skill)
 		lose(L_CAPTURED);
 	/* re-outfit new ship */
 	printf("You are hereby put in charge of an antiquated but still\n");
 	printf("  functional ship, the Fairie Queene.\n");
 	Ship.ship = QUEENE;
 	Ship.shipname = "Fairie Queene";
 	Param.energy = Ship.energy = 3000;
 	Param.torped = Ship.torped = 6;
 	Param.shield = Ship.shield = 1250;
 	Ship.shldup = 0;
 	Ship.cloaked = 0;
 	Ship.warp = 5.0;
 	Ship.warp2 = 25.0;
 	Ship.warp3 = 125.0;
 	Ship.cond = GREEN;
 	/* clear out damages on old ship */
-	for (i = 0; i < MAXEVENTS; i++)
+	for (i = 0; i < MAXEVENTS; i++) {
 		e = &Event[i];
 		if (e->evcode != E_FIXDV)
 			continue;
 		unschedule(e);
+	}
 	/* get rid of some devices and redistribute probabilities */
 	i = Param.damprob[SHUTTLE] + Param.damprob[CLOAK];
 	Param.damprob[SHUTTLE] = Param.damprob[CLOAK] = 0;
 	while (i > 0)
-		for (j = 0; j < NDEV; j++)
+		for (j = 0; j < NDEV; j++) {
 			if (Param.damprob[j] != 0) {
 			if (Param.damprob[j] != 0)
 				Param.damprob[j] += 1;
 				i--;
 				if (i <= 0)
 					break;
+			}
+		}
 	/* pick a starbase to restart at */
 	i = ranf(Now.bases);
 	Ship.quadx = Now.base[i].x;
 	Ship.quady = Now.base[i].y;
 	/* setup that quadrant */
-	while (1)
+	while (1) {
 		initquad(1);
 		Sect[Ship.sectx][Ship.secty] = EMPTY;
-		for (i = 0; i < 5; i++)
+		for (i = 0; i < 5; i++) {
 			Ship.sectx = Etc.starbase.x + ranf(3) - 1;
 			if (Ship.sectx < 0 || Ship.sectx >= NSECTS)
 				continue;
 			Ship.secty = Etc.starbase.y + ranf(3) - 1;
 			if (Ship.secty < 0 || Ship.secty >= NSECTS)
 				continue;
-			if (Sect[Ship.sectx][Ship.secty] == EMPTY)
+			if (Sect[Ship.sectx][Ship.secty] == EMPTY) {
 				Sect[Ship.sectx][Ship.secty] = QUEENE;
 				dock(0);
 				compkldist(0);
 				return;
+			}
+		}
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dcrept.c,v 1.8 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: dcrept.c,v 1.9 2009/05/24 21:44:56 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[] = "@(#)dcrept.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dcrept.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: dcrept.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 /*
 **  damage control report
 **
 **	Print damages and time to fix.  This is taken from the event
 **	list.  A couple of factors are set up, based on whether or not
 **	we are docked.  (One of these factors will always be 1.0.)
 **	The event list is then scanned for damage fix events, the
 @@ -53,49 +53,44 @@ __RCSID("$NetBSD: dcrept.c,v 1.8 2009/05
 **	fix things if you are docked.
 */
 /*ARGSUSED*/
 void
 dcrept(int v __unused)
+{
 	int		i, f;
 	double		x;
 	double		m1, m2;
 	struct event	*e;
 	/* set up the magic factors to output the time till fixed */
-	if (Ship.cond == DOCKED)
+	if (Ship.cond == DOCKED) {
 		m1 = 1.0 / Param.dockfac;
 		m2 = 1.0;
 	} else {
 	else
 		m1 = 1.0;
 		m2 = Param.dockfac;
+	}
 	printf("Damage control report:\n");
 	f = 1;
 	/* scan for damages */
-	for (i = 0; i < MAXEVENTS; i++)
+	for (i = 0; i < MAXEVENTS; i++) {
 		e = &Event[i];
 		if (e->evcode != E_FIXDV)
 			continue;
 		/* output the title first time */
-		if (f)
+		if (f) {
 			printf("\t\t\t  repair times\n");
 			printf("device\t\t\tin flight  docked\n");
 			f = 0;
+		}
 		/* compute time till fixed, then adjust by the magic factors */
 		x = e->date - Now.date;
 		printf("%-24s%7.2f  %7.2f\n",
 			Device[e->systemname].name, x * m1 + 0.005, x * m2 + 0.005);
 		/* do a little consistancy checking */
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dock.c,v 1.8 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: dock.c,v 1.9 2009/05/24 21:44:56 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[] = "@(#)dock.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dock.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: dock.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 /*
 **  DOCK TO STARBASE
 **
 **	The starship is docked to a starbase.  For this to work you
 **	must be adjacent to a starbase.
 **
 **	You get your supplies replenished and your captives are
 @@ -60,36 +60,33 @@ __RCSID("$NetBSD: dock.c,v 1.8 2009/05/2
 void
 dock(int v __unused)
+{
 	int		i, j;
 	int		ok;
 	struct event	*e;
 	if (Ship.cond == DOCKED) {
 		printf("Chekov: But captain, we are already docked\n");
 		return;
+	}
 	/* check for ok to dock, i.e., adjacent to a starbase */
 	ok = 0;
-	for (i = Ship.sectx - 1; i <= Ship.sectx + 1 && !ok; i++)
+	for (i = Ship.sectx - 1; i <= Ship.sectx + 1 && !ok; i++) {
 		if (i < 0 || i >= NSECTS)
 			continue;
-		for (j = Ship.secty - 1; j <= Ship.secty + 1; j++)
+		for (j = Ship.secty - 1; j <= Ship.secty + 1; j++) {
 			if (j  < 0 || j >= NSECTS)
 				continue;
-			if (Sect[i][j] == BASE)
+			if (Sect[i][j] == BASE) {
 				ok++;
 				break;
+			}
+		}
+	}
 	if (!ok) {
 		printf("Chekov: But captain, we are not adjacent to a starbase.\n");
 		return;
+	}
 	/* restore resources */
 	Ship.energy = Param.energy;
 	Ship.torped = Param.torped;
 @@ -101,56 +98,53 @@ dock(int v __unused)
 	/* reset ship's defenses */
 	Ship.shldup = 0;
 	Ship.cloaked = 0;
 	Ship.cond = DOCKED;
 	Ship.reserves = Param.reserves;
 	/* recalibrate space inertial navigation system */
 	Ship.sinsbad = 0;
 	/* output any saved radio messages */
 	dumpssradio();
 	/* reschedule any device repairs */
-	for (i = 0; i < MAXEVENTS; i++)
+	for (i = 0; i < MAXEVENTS; i++) {
 		e = &Event[i];
 		if (e->evcode != E_FIXDV)
 			continue;
 		reschedule(e, (e->date - Now.date) * Param.dockfac);
+	}
 	return;
+}
 /*
 **  LEAVE A STARBASE
 **
 **	This is the inverse of dock().  The main function it performs
 **	is to reschedule any damages so that they will take longer.
 */
 /*ARGSUSED*/
 void
 undock(int v __unused)
+{
 	struct event	*e;
 	int		i;
-	if (Ship.cond != DOCKED)
+	if (Ship.cond != DOCKED) {
 		printf("Sulu: Pardon me captain, but we are not docked.\n");
 		return;
+	}
 	Ship.cond = GREEN;
 	Move.free = 0;
 	/* reschedule device repair times (again) */
-	for (i = 0; i < MAXEVENTS; i++)
+	for (i = 0; i < MAXEVENTS; i++) {
 		e = &Event[i];
 		if (e->evcode != E_FIXDV)
 			continue;
 		reschedule(e, (e->date - Now.date) / Param.dockfac);
+	}
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: impulse.c,v 1.8 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: impulse.c,v 1.9 2009/05/24 21:44:56 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[] = "@(#)impulse.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: impulse.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: impulse.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 #include "getpar.h"
 /**
  **	move under impulse power
  **/
 /*ARGSUSED*/
 void
 @@ -57,34 +57,32 @@ impulse(int v __unused)
 	if (Ship.cond == DOCKED) {
 		printf("Scotty: Sorry captain, but we are still docked.\n");
 		return;
+	}
 	if (damaged(IMPULSE)) {
 		out(IMPULSE);
 		return;
+	}
 	if (getcodi(&course, &dist))
 		return;
 	power = 20 + 100 * dist;
 	percent = 100 * power / Ship.energy + 0.5;
-	if (percent >= 85)
+	if (percent >= 85) {
 		printf("Scotty: That would consume %d%% of our remaining energy.\n",
 			percent);
 		if (!getynpar("Are you sure that is wise"))
 			return;
 		printf("Aye aye, sir\n");
+	}
 	time = dist / 0.095;
 	percent = 100 * time / Now.time + 0.5;
-	if (percent >= 85)
+	if (percent >= 85) {
 		printf("Spock: That would take %d%% of our remaining time.\n",
 			percent);
 		if (!getynpar("Are you sure that is wise"))
 			return;
 		printf("(He's finally gone mad)\n");
+	}
 	Move.time = move(0, course, time, 0.095);
 	Ship.energy -= 20 + 100 * Move.time * 0.095;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lose.c,v 1.8 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: lose.c,v 1.9 2009/05/24 21:44:56 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,68 +24,65 @@
  * 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[] = "@(#)lose.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: lose.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: lose.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <setjmp.h>
 #include <unistd.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  PRINT OUT LOSER MESSAGES
 **
 **	The messages are printed out, the score is computed and
 **	printed, and the game is restarted.  Oh yeh, any special
 **	actions which need be taken are taken.
 */
 extern jmp_buf	env;
-const char	*const Losemsg[] =
+const char	*const Losemsg[] = {
 	"You ran out of time",
 	"You ran out of energy",
 	"You have been destroyed",
 	"You ran into the negative energy barrier",
 	"You destroyed yourself by nova'ing that star",
 	"You have been caught in a supernova",
 	"You just suffocated in outer space",
 	"You could not be rematerialized",
 	"\n\032\014 ***\07 Ship's hull has imploded\07 ***",
 	"You have burned up in a star",
 	"Well, you destroyed yourself, but it didn't do any good",
 	"You have been captured by Klingons and mercilessly tortured",
 	"Your last crew member died",
 };
 void
 lose(int why)
+{
 	Game.killed = 1;
 	sleep(1);
 	printf("\n%s\n", Losemsg[why - 1]);
-	switch (why)
+	switch (why) {
 	  case L_NOTIME:
 		Game.killed = 0;
 		break;
+	}
 	Move.endgame = -1;
 	score();
 	skiptonl(0);
 	longjmp(env, 1);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lrscan.c,v 1.8 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: lrscan.c,v 1.9 2009/05/24 21:44:56 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,90 +24,83 @@
  * 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[] = "@(#)lrscan.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: lrscan.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: lrscan.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 /*
 **  LONG RANGE OF SCANNERS
 **
 **	A summary of the quadrants that surround you is printed.  The
 **	hundreds digit is the number of Klingons in the quadrant,
 **	the tens digit is the number of starbases, and the units digit
 **	is the number of stars.  If the printout is "///" it means
 **	that that quadrant is rendered uninhabitable by a supernova.
 **	It also updates the "scanned" field of the quadrants it scans,
 **	for future use by the "chart" option of the computer.
 */
 /*ARGSUSED*/
 void
 lrscan(int v __unused)
+{
 	int		i, j;
 	struct quad	*q;
-	if (check_out(LRSCAN))
+	if (check_out(LRSCAN)) {
 		return;
+	}
 	printf("Long range scan for quadrant %d,%d\n\n", Ship.quadx, Ship.quady);
 	/* print the header on top */
-	for (j = Ship.quady - 1; j <= Ship.quady + 1; j++)
+	for (j = Ship.quady - 1; j <= Ship.quady + 1; j++) {
 		if (j < 0 || j >= NQUADS)
 			printf("      ");
 		else
 			printf("     %1d", j);
+	}
 	/* scan the quadrants */
-	for (i = Ship.quadx - 1; i <= Ship.quadx + 1; i++)
+	for (i = Ship.quadx - 1; i <= Ship.quadx + 1; i++) {
 		printf("\n  -------------------\n");
-		if (i < 0 || i >= NQUADS)
+		if (i < 0 || i >= NQUADS) {
 			/* negative energy barrier */
 			printf("  !  *  !  *  !  *  !");
 			continue;
+		}
 		/* print the left hand margin */
 		printf("%1d !", i);
-		for (j = Ship.quady - 1; j <= Ship.quady + 1; j++)
+		for (j = Ship.quady - 1; j <= Ship.quady + 1; j++) {
 			if (j < 0 || j >= NQUADS) {
 			if (j < 0 || j >= NQUADS)
 				/* negative energy barrier again */
 				printf("  *  !");
 				continue;
+			}
 			q = &Quad[i][j];
-			if (q->stars < 0)
+			if (q->stars < 0) {
 				/* supernova */
 				printf(" /// !");
 				q->scanned = 1000;
 				continue;
+			}
 			q->scanned = q->klings * 100 + q->bases * 10 + q->stars;
 			printf(" %3d !", q->scanned);
+		}
+	}
 	printf("\n  -------------------\n");
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: move.c,v 1.8 2009/05/24 20:39:43 dholland Exp $	*/
+/*	$NetBSD: move.c,v 1.9 2009/05/24 21:44:56 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[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: move.c,v 1.8 2009/05/24 20:39:43 dholland Exp $");
+__RCSID("$NetBSD: move.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <math.h>
 #include "trek.h"
 /*
 **  Move Under Warp or Impulse Power
 **
 **	`Ramflag' is set if we are to be allowed to ram stars,
 **	Klingons, etc.  This is passed from warp(), which gets it from
 **	either play() or ram().  Course is the course (0 -> 360) at
 @@ -112,58 +112,54 @@ move(int ramflag, int course, double tim
 		bigger = dist;
 	dx /= bigger;
 	dy /= bigger;
 	/* check for long range tractor beams */
 	/****  TEMPORARY CODE == DEBUGGING  ****/
 	evtime = Now.eventptr[E_LRTB]->date - Now.date;
 #ifdef xTRACE
 	if (Trace)
 		printf("E.ep = %p, ->evcode = %d, ->date = %.2f, evtime = %.2f\n",
 			Now.eventptr[E_LRTB], Now.eventptr[E_LRTB]->evcode,
 			Now.eventptr[E_LRTB]->date, evtime);
 #endif
-	if (time > evtime && Etc.nkling < 3)
+	if (time > evtime && Etc.nkling < 3) {
 		/* then we got a LRTB */
 		evtime += 0.005;
 		time = evtime;
 	} else
 	else
 		evtime = -1.0e50;
 	dist = time * speed;
 	/* move within quadrant */
 	Sect[Ship.sectx][Ship.secty] = EMPTY;
 	x = Ship.sectx + 0.5;
 	y = Ship.secty + 0.5;
 	xn = NSECTS * dist * bigger;
 	n = xn + 0.5;
 #ifdef xTRACE
 	if (Trace)
 		printf("dx = %.2f, dy = %.2f, xn = %.2f, n = %d\n", dx, dy, xn, n);
 #endif
 	Move.free = 0;
-	for (i = 0; i < n; i++)
+	for (i = 0; i < n; i++) {
 		ix = (x += dx);
 		iy = (y += dy);
 #ifdef xTRACE
 		if (Trace)
 			printf("ix = %d, x = %.2f, iy = %d, y = %.2f\n", ix, x, iy, y);
 #endif
-		if (x < 0.0 || y < 0.0 || x >= sectsize || y >= sectsize)
+		if (x < 0.0 || y < 0.0 || x >= sectsize || y >= sectsize) {
 			/* enter new quadrant */
 			dx = Ship.quadx * NSECTS + Ship.sectx + dx * xn;
 			dy = Ship.quady * NSECTS + Ship.secty + dy * xn;
 			if (dx < 0.0)
 				ix = -1;
 			else
 				ix = dx + 0.5;
 			if (dy < 0.0)
 				iy = -1;
 			else
 				iy = dy + 0.5;
 #ifdef xTRACE
 			if (Trace)
 @@ -180,53 +176,51 @@ move(int ramflag, int course, double tim
 			Ship.sectx = ix % NSECTS;
 			Ship.secty = iy % NSECTS;
 			if (ix < 0 || Ship.quadx >= NQUADS || iy < 0 ||
 			    Ship.quady >= NQUADS) {
 				if (!damaged(COMPUTER)) {
 					dumpme(0);
 				} else
 					lose(L_NEGENB);
+			}
 			initquad(0);
 			n = 0;
 			break;
+		}
-		if (Sect[ix][iy] != EMPTY)
+		if (Sect[ix][iy] != EMPTY) {
 			/* we just hit something */
-			if (!damaged(COMPUTER) && ramflag <= 0)
+			if (!damaged(COMPUTER) && ramflag <= 0) {
 				ix = x - dx;
 				iy = y - dy;
 				printf("Computer reports navigation error; %s stopped at %d,%d\n",
 					Ship.shipname, ix, iy);
 				Ship.energy -= Param.stopengy * speed;
 				break;
+			}
 			/* test for a black hole */
-			if (Sect[ix][iy] == HOLE)
+			if (Sect[ix][iy] == HOLE) {
 				/* get dumped elsewhere in the galaxy */
 				dumpme(1);
 				initquad(0);
 				n = 0;
 				break;
+			}
 			ram(ix, iy);
 			break;
+		}
+	}
-	if (n > 0)
+	if (n > 0) {
 		dx = Ship.sectx - ix;
 		dy = Ship.secty - iy;
 		dist = sqrt(dx * dx + dy * dy) / NSECTS;
 		time = dist / speed;
-		if (evtime > time)
+		if (evtime > time) {
-			time = evtime;		/* spring the LRTB trap */
+			/* spring the LRTB trap */
 			time = evtime;
+		}
 		Ship.sectx = ix;
 		Ship.secty = iy;
+	}
 	Sect[Ship.sectx][Ship.secty] = Ship.ship;
 	compkldist(0);
 	return (time);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: win.c,v 1.8 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: win.c,v 1.9 2009/05/24 21:44:56 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.8 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: win.c,v 1.9 2009/05/24 21:44:56 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
 @@ -64,31 +64,29 @@ win(void)
+{
 	long		s;
 	const struct cvntab	*p = NULL;
 	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 && 5 * Game.kills + Game.deaths < 100 &&
-			s >= 1000 && Ship.ship == ENTERPRISE)
+			s >= 1000 && Ship.ship == ENTERPRISE) {
 		printf("In fact, you are promoted one step in rank,\n");
-		if (Game.skill >= 6)
+		if (Game.skill >= 6) {
 			printf("to the exalted rank of Commodore Emeritus\n");
-		else
+		} else {
 			p = &Skitab[Game.skill - 1];
 			printf("from %s%s ", p->abrev, p->full);
 			p++;
 			printf("to %s%s\n", p->abrev, p->full);
+		}
+	}
 	/* clean out input, and request new game */
 	skiptonl(0);
 	longjmp(env, 1);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: attack.c,v 1.6 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: attack.c,v 1.7 2009/05/24 21:44:56 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[] = "@(#)attack.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: attack.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: attack.c,v 1.7 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <math.h>
 #include "trek.h"
 /*
 **  Klingon Attack Routine
 **
 **	This routine performs the Klingon attack provided that
 **	(1) Something happened this move (i.e., not free), and
 **	(2) You are not cloaked.  Note that if you issue the
 @@ -82,114 +82,106 @@ attack(int resting)
 	double		chgfac, propor, extradm;
 	double		dustfac, tothe;
 	int		cas;
 	int		hitflag;
 	if (Move.free)
 		return;
 	if (Etc.nkling <= 0 || Quad[Ship.quadx][Ship.quady].stars < 0)
 		return;
 	if (Ship.cloaked && Ship.cloakgood)
 		return;
 	/* move before attack */
 	klmove(0);
-	if (Ship.cond == DOCKED)
+	if (Ship.cond == DOCKED) {
 		if (!resting)
 			printf("Starbase shields protect the %s\n", Ship.shipname);
 		return;
+	}
 	/* setup shield effectiveness */
 	chgfac = 1.0;
 	if (Move.shldchg)
 		chgfac = 0.25 + 0.50 * franf();
 	maxhit = tothit = 0;
 	hitflag = 0;
 	/* let each Klingon do his damndest */
-	for (i = 0; i < Etc.nkling; i++)
+	for (i = 0; i < Etc.nkling; i++) {
 		/* if he's low on power he won't attack */
 		if (Etc.klingon[i].power < 20)
 			continue;
-		if (!hitflag)
+		if (!hitflag) {
 			printf("\nStardate %.2f: Klingon attack:\n",
 				Now.date);
 			hitflag++;
+		}
 		/* complete the hit */
 		dustfac = 0.90 + 0.01 * franf();
 		tothe = Etc.klingon[i].avgdist;
 		hit = Etc.klingon[i].power * pow(dustfac, tothe) * Param.hitfac;
 		/* deplete his energy */
 		dustfac = Etc.klingon[i].power;
 		Etc.klingon[i].power = dustfac * Param.phasfac * (1.0 + (franf() - 0.5) * 0.2);
 		/* see how much of hit shields will absorb */
 		shldabsb = 0;
-		if (Ship.shldup || Move.shldchg)
+		if (Ship.shldup || Move.shldchg) {
 			propor = Ship.shield;
 			propor /= Param.shield;
 			shldabsb = propor * chgfac * hit;
 			if (shldabsb > Ship.shield)
 				shldabsb = Ship.shield;
 			Ship.shield -= shldabsb;
+		}
 		/* actually do the hit */
 		printf("HIT: %d units", hit);
 		if (!damaged(SRSCAN))
 			printf(" from %d,%d", Etc.klingon[i].x, Etc.klingon[i].y);
 		cas = (shldabsb * 100) / hit;
 		hit -= shldabsb;
 		if (shldabsb > 0)
 			printf(", shields absorb %d%%, effective hit %d\n",
 				cas, hit);
 		else
 			printf("\n");
 		tothit += hit;
 		if (hit > maxhit)
 			maxhit = hit;
 		Ship.energy -= hit;
 		/* see if damages occurred */
-		if (hit >= (15 - Game.skill) * (25 - ranf(12)))
+		if (hit >= (15 - Game.skill) * (25 - ranf(12))) {
 			printf("CRITICAL HIT!!!\n");
 			/* select a device from probability vector */
 			cas = ranf(1000);
 			for (l = 0; cas >= 0; l++)
 				cas -= Param.damprob[l];
 			l -= 1;
 			/* compute amount of damage */
 			extradm = (hit * Param.damfac[l]) / (75 + ranf(25)) + 0.5;
 			/* damage the device */
 			damage(l, extradm);
-			if (damaged(SHIELD))
+			if (damaged(SHIELD)) {
 				if (Ship.shldup)
 					printf("Sulu: Shields knocked down, captain.\n");
 				Ship.shldup = 0;
 				Move.shldchg = 0;
+			}
+		}
 		if (Ship.energy <= 0)
 			lose(L_DSTRYD);
+	}
 	/* see what our casualities are like */
-	if (maxhit >= 200 || tothit >= 500)
+	if (maxhit >= 200 || tothit >= 500) {
 		cas = tothit * 0.015 * franf();
-		if (cas >= 2)
+		if (cas >= 2) {
 			printf("McCoy: we suffered %d casualties in that attack.\n",
 				cas);
 			Game.deaths += cas;
 			Ship.crew -= cas;
+		}
+	}
 	/* allow Klingons to move after attacking */
 	klmove(1);
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dumpme.c,v 1.6 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: dumpme.c,v 1.7 2009/05/24 21:44:56 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[] = "@(#)dumpme.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dumpme.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: dumpme.c,v 1.7 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 /*
 **  Dump the starship somewhere in the galaxy
 **
 **	Parameter is zero if bounce off of negative energy barrier,
 **	one if through a black hole
 **
 **	Note that the quadrant is NOT initialized here.  This must
 @@ -58,35 +58,31 @@ dumpme(int flag)
+{
 	int		f;
 	double		x;
 	struct event	*e;
 	int		i;
 	f = flag;
 	Ship.quadx = ranf(NQUADS);
 	Ship.quady = ranf(NQUADS);
 	Ship.sectx = ranf(NSECTS);
 	Ship.secty = ranf(NSECTS);
 	x = 1.5 * franf();
 	Move.time += x;
-	if (f)
+	if (f) {
 		printf("%s falls into a black hole.\n", Ship.shipname);
 	} else {
 	else
 		printf("Computer applies full reverse power to avoid hitting the\n");
 		printf("   negative energy barrier.  A space warp was entered.\n");
+	}
 	/* bump repair dates forward */
-	for (i = 0; i < MAXEVENTS; i++)
+	for (i = 0; i < MAXEVENTS; i++) {
 		e = &Event[i];
 		if (e->evcode != E_FIXDV)
 			continue;
 		reschedule(e, (e->date - Now.date) + x);
+	}
 	events(1);
 	printf("You are now in quadrant %d,%d.  It is stardate %.2f\n",
 		Ship.quadx, Ship.quady, Now.date);
 	Move.time = 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: initquad.c,v 1.6 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: initquad.c,v 1.7 2009/05/24 21:44:56 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[] = "@(#)initquad.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: initquad.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: initquad.c,v 1.7 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 /*
 **  Paramize Quadrant Upon Entering
 **
 **	A quadrant is initialized from the information held in the
 **	Quad matrix.  Basically, everything is just initialized
 **	randomly, except for the starship, which goes into a fixed
 **	sector.
 @@ -68,89 +68,82 @@ initquad(int f)
 	int		nholes;
 	q = &Quad[Ship.quadx][Ship.quady];
 	/* ignored supernova'ed quadrants (this is checked again later anyway */
 	if (q->stars < 0)
 		return;
 	Etc.nkling = q->klings;
 	nbases = q->bases;
 	nstars = q->stars;
 	nholes = q->holes;
 	/* have we blundered into a battle zone w/ shields down? */
-	if (Etc.nkling > 0 && !f)
+	if (Etc.nkling > 0 && !f) {
 		printf("Condition RED\n");
 		Ship.cond = RED;
 		if (!damaged(COMPUTER))
 			shield(1);
+	}
 	/* clear out the quadrant */
 	for (i = 0; i < NSECTS; i++)
 		for (j = 0; j < NSECTS; j++)
 			Sect[i][j] = EMPTY;
 	/* initialize Enterprise */
 	Sect[Ship.sectx][Ship.secty] = Ship.ship;
 	/* initialize Klingons */
-	for (i = 0; i < Etc.nkling; i++)
+	for (i = 0; i < Etc.nkling; i++) {
 		sector(&rx, &ry);
 		Sect[rx][ry] = KLINGON;
 		Etc.klingon[i].x = rx;
 		Etc.klingon[i].y = ry;
 		Etc.klingon[i].power = Param.klingpwr;
 		Etc.klingon[i].srndreq = 0;
+	}
 	compkldist(1);
 	/* initialize star base */
-	if (nbases > 0)
+	if (nbases > 0) {
 		sector(&rx, &ry);
 		Sect[rx][ry] = BASE;
 		Etc.starbase.x = rx;
 		Etc.starbase.y = ry;
+	}
 	/* initialize inhabited starsystem */
-	if (q->qsystemname != 0)
+	if (q->qsystemname != 0) {
 		sector(&rx, &ry);
 		Sect[rx][ry] = INHABIT;
 		nstars -= 1;
+	}
 	/* initialize black holes */
-	for (i = 0; i < nholes; i++)
+	for (i = 0; i < nholes; i++) {
 		sector(&rx, &ry);
 		Sect[rx][ry] = HOLE;
+	}
 	/* initialize stars */
-	for (i = 0; i < nstars; i++)
+	for (i = 0; i < nstars; i++) {
 		sector(&rx, &ry);
 		Sect[rx][ry] = STAR;
+	}
 	Move.newquad = 1;
+}
 void
 sector(int *x, int *y)
+{
 	int	i, j;
-	do
+	do {
 		i = ranf(NSECTS);
 		j = ranf(NSECTS);
 	} while (Sect[i][j] != EMPTY);
 	*x = i;
 	*y = j;
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ram.c,v 1.6 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: ram.c,v 1.7 2009/05/24 21:44:56 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,55 +24,54 @@
  * 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[] = "@(#)ram.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: ram.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: ram.c,v 1.7 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <unistd.h>
 #include "trek.h"
 /*
 **  RAM SOME OBJECT
 **
 **	You have run into some sort of object.  It may be a Klingon,
 **	a star, or a starbase.  If you run into a star, you are really
 **	stupid, because there is no hope for you.
 **
 **	If you run into something else, you destroy that object.  You
 **	also rack up incredible damages.
 */
 void
 ram(int ix, int iy)
+{
 	int		i;
 	char		c;
 	printf("\07RED ALERT\07: collision imminent\n");
 	c = Sect[ix][iy];
-	switch (c)
+	switch (c) {
 	  case KLINGON:
 		printf("%s rams Klingon at %d,%d\n", Ship.shipname, ix, iy);
 		killk(ix, iy);
 		break;
 	  case STAR:
 	  case INHABIT:
 		printf("Yeoman Rand: Captain, isn't it getting hot in here?\n");
 		sleep(2);
 		printf("Spock: Hull temperature approaching 550 Degrees Kelvin.\n");
 		lose(L_STAR);
 @@ -84,23 +83,22 @@ ram(int ix, int iy)
 			Game.killb += 1;
 		break;
+	}
 	sleep(2);
 	printf("%s heavily damaged\n", Ship.shipname);
 	/* select the number of deaths to occur */
 	i = 10 + ranf(20 * Game.skill);
 	Game.deaths += i;
 	Ship.crew -= i;
 	printf("McCoy: Take it easy Jim; we had %d casualties.\n", i);
 	/* damage devices with an 80% probability */
-	for (i = 0; i < NDEV; i++)
+	for (i = 0; i < NDEV; i++) {
 		if (ranf(100) < 20)
 			continue;
 		damage(i, (2.5 * (franf() + franf()) + 1.0) * Param.damfac[i]);
+	}
 	/* no chance that your shields remained up in all that */
 	Ship.shldup = 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: score.c,v 1.6 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: score.c,v 1.7 2009/05/24 21:44:56 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.6 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: score.c,v 1.7 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  PRINT OUT THE CURRENT SCORE
 */
 long
 score(void)
 @@ -60,49 +60,46 @@ score(void)
 		printf("%d Klingons killed\t\t\t%6d\n", u, t);
 	r = Now.date - Param.date;
 	if (r < 1.0)
 		r = 1.0;
 	r = Game.killk / r;
 	s += (t = 400 * r);
 	if (t != 0)
 		printf("Kill rate %.2f Klingons/stardate  \t%6d\n", r, t);
 	r = Now.klings;
 	r /= Game.killk + 1;
 	s += (t = -400 * r);
 	if (t != 0)
 		printf("Penalty for %d klingons remaining\t%6d\n", Now.klings, t);
-	if (Move.endgame > 0)
+	if (Move.endgame > 0) {
 		s += (t = 100 * (u = Game.skill));
 		printf("Bonus for winning a %s%s game\t\t%6d\n", Skitab[u - 1].abrev, Skitab[u - 1].full, t);
+	}
-	if (Game.killed)
+	if (Game.killed) {
 		s -= 500;
 		printf("Penalty for getting killed\t\t  -500\n");
+	}
 	s += (t = -100 * (u = Game.killb));
 	if (t != 0)
 		printf("%d starbases killed\t\t\t%6d\n", u, t);
 	s += (t = -100 * (u = Game.helps));
 	if (t != 0)
 		printf("%d calls for help\t\t\t%6d\n", u, t);
 	s += (t = -5 * (u = Game.kills));
 	if (t != 0)
 		printf("%d stars destroyed\t\t\t%6d\n", u, t);
 	s += (t = -150 * (u = Game.killinhab));
 	if (t != 0)
 		printf("%d inhabited starsystems destroyed\t%6d\n", u, t);
-	if (Ship.ship != ENTERPRISE)
+	if (Ship.ship != ENTERPRISE) {
 		s -= 200;
 		printf("penalty for abandoning ship\t\t  -200\n");
+	}
 	s += (t = 3 * (u = Game.captives));
 	if (t != 0)
 		printf("%d Klingons captured\t\t\t%6d\n", u, t);
 	s += (t = -(u = Game.deaths));
 	if (t != 0)
 		printf("%d casualties\t\t\t\t%6d\n", u, t);
 	printf("\n***  TOTAL\t\t\t%14ld\n", s);
 	return (s);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: snova.c,v 1.6 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: snova.c,v 1.7 2009/05/24 21:44:56 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[] = "@(#)snova.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: snova.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: snova.c,v 1.7 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <unistd.h>
 #include "trek.h"
 /*
 **  CAUSE SUPERNOVA TO OCCUR
 **
 **	A supernova occurs.  If 'ix' < 0, a random quadrant is chosen;
 **	otherwise, the current quadrant is taken, and (ix, iy) give
 **	the sector quadrants of the star which is blowing up.
 @@ -65,99 +65,86 @@ __RCSID("$NetBSD: snova.c,v 1.6 2009/05/
 void
 snova(int x, int y)
+{
 	int		qx, qy;
 	int		ix, iy = 0;
 	int		f;
 	int		dx, dy;
 	int		n;
 	struct quad	*q;
 	f = 0;
 	ix = x;
-	if (ix < 0)
+	if (ix < 0) {
 		/* choose a quadrant */
-		while (1)
+		while (1) {
 			qx = ranf(NQUADS);
 			qy = ranf(NQUADS);
 			q = &Quad[qx][qy];
 			if (q->stars > 0)
 				break;
+		}
-		if (Ship.quadx == qx && Ship.quady == qy)
+		if (Ship.quadx == qx && Ship.quady == qy) {
 			/* select a particular star */
 			n = ranf(q->stars);
-			for (ix = 0; ix < NSECTS; ix++)
+			for (ix = 0; ix < NSECTS; ix++) {
 				for (iy = 0; iy < NSECTS; iy++)
 					if (Sect[ix][iy] == STAR || Sect[ix][iy] == INHABIT)
 						if ((n -= 1) <= 0)
 							break;
 				if (n <= 0)
 					break;
+			}
 			f = 1;
+		}
 	} else {
 	else
 		/* current quadrant */
 		iy = y;
 		qx = Ship.quadx;
 		qy = Ship.quady;
 		q = &Quad[qx][qy];
 		f = 1;
+	}
-	if (f)
+	if (f) {
 		/* supernova is in same quadrant as Enterprise */
 		printf("\nRED ALERT: supernova occuring at %d,%d\n", ix, iy);
 		dx = ix - Ship.sectx;
 		dy = iy - Ship.secty;
-		if (dx * dx + dy * dy <= 2)
+		if (dx * dx + dy * dy <= 2) {
 			printf("***  Emergency override attem");
 			sleep(1);
 			printf("\n");
 			lose(L_SNOVA);
+		}
 		q->scanned = 1000;
 	} else {
-	else
+		if (!damaged(SSRADIO)) {
 		if (!damaged(SSRADIO))
 			q->scanned = 1000;
 			printf("\nUhura: Captain, Starfleet Command reports a supernova\n");
 			printf("  in quadrant %d,%d.  Caution is advised\n", qx, qy);
+		}
+	}
 	/* clear out the supernova'ed quadrant */
 	dx = q->klings;
 	dy = q->stars;
 	Now.klings -= dx;
-	if (x >= 0)
+	if (x >= 0) {
 		/* Enterprise caused supernova */
 		Game.kills += dy;
 		if (q->bases)
 			killb(qx, qy);
 		Game.killk += dx;
 	} else {
 	else
 		if (q->bases)
 			killb(qx, qy);
+	}
 	killd(qx, qy, (x >= 0));
 	q->stars = -1;
 	q->klings = 0;
-	if (Now.klings <= 0)
+	if (Now.klings <= 0) {
 		printf("Lucky devil, that supernova destroyed the last klingon\n");
 		win();
+	}
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: capture.c,v 1.9 2009/05/24 20:39:43 dholland Exp $	*/
+/*	$NetBSD: capture.c,v 1.10 2009/05/24 21:44:56 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[] = "@(#)capture.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: capture.c,v 1.9 2009/05/24 20:39:43 dholland Exp $");
+__RCSID("$NetBSD: capture.c,v 1.10 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 /*
 **  Ask a Klingon To Surrender
 **
 **	(Fat chance)
 **
 **	The Subspace Radio is needed to ask a Klingon if he will kindly
 **	surrender.  A random Klingon from the ones in the quadrant is
 @@ -54,60 +54,57 @@ __RCSID("$NetBSD: capture.c,v 1.9 2009/0
 **	is a function of that Klingon's remaining power, our power,
 **	etc.
 */
 /*ARGSUSED*/
 void
 capture(int v __unused)
+{
 	int		i;
 	struct kling	*k;
 	double			x;
 	/* check for not cloaked */
-	if (Ship.cloaked)
+	if (Ship.cloaked) {
 		printf("Ship-ship communications out when cloaked\n");
 		return;
+	}
 	if (damaged(SSRADIO)) {
 		out(SSRADIO);
 		return;
+	}
 	/* find out if there are any at all */
-	if (Etc.nkling <= 0)
+	if (Etc.nkling <= 0) {
 		printf("Uhura: Getting no response, sir\n");
 		return;
+	}
 	/* if there is more than one Klingon, find out which one */
 	k = selectklingon();
 	Move.free = 0;
 	Move.time = 0.05;
 	/* check out that Klingon */
 	k->srndreq++;
 	x = Param.klingpwr;
 	x *= Ship.energy;
 	x /= k->power * Etc.nkling;
 	x *= Param.srndrprob;
 	i = x;
 #ifdef xTRACE
 	if (Trace)
 		printf("Prob = %d (%.4f)\n", i, x);
 #endif
-	if (i > ranf(100))
+	if (i > ranf(100)) {
 		/* guess what, he surrendered!!! */
 		printf("Klingon at %d,%d surrenders\n", k->x, k->y);
 		i = ranf(Param.klingcrew);
 		if ( i > 0 )
 			printf("%d klingons commit suicide rather than be taken captive\n", Param.klingcrew - i);
 		if (i > Ship.brigfree)
 			i = Ship.brigfree;
 		Ship.brigfree -= i;
 		printf("%d captives taken\n", i);
 		killk(k->x, k->y);
 		return;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: destruct.c,v 1.9 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: destruct.c,v 1.10 2009/05/24 21:44:56 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[] = "@(#)destruct.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: destruct.c,v 1.9 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: destruct.c,v 1.10 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  Self Destruct Sequence
 **
 **	The computer starts up the self destruct sequence.  Obviously,
 @@ -69,55 +69,52 @@ void
 destruct(int v __unused)
+{
 	char		checkpass[15];
 	int	i, j;
 	double		zap;
 	if (damaged(COMPUTER)) {
 		out(COMPUTER);
 		return;
+	}
 	printf("\n\07 --- WORKING ---\07\n");
 	sleep(3);
 	/* output the count 10 9 8 7 6 */
-	for (i = 10; i > 5; i--)
+	for (i = 10; i > 5; i--) {
 		for (j = 10;  j > i; j--)
 			printf("   ");
 		printf("%d\n", i);
 		sleep(1);
+	}
 	/* check for password on new line only */
 	skiptonl(0);
 	getstrpar("Enter password verification", checkpass, 14, 0);
 	sleep(2);
 	if (strcmp(checkpass, Game.passwd) != 0) {
 		printf("Self destruct sequence aborted\n");
 		return;
+	}
 	printf("Password verified; self destruct sequence continues:\n");
 	sleep(2);
 	/* output count 5 4 3 2 1 0 */
-	for (i = 5; i >= 0; i--)
+	for (i = 5; i >= 0; i--) {
 		sleep(1);
 		for (j = 5; j > i; j--)
 			printf("   ");
 		printf("%d\n", i);
+	}
 	sleep(2);
 	printf("\032\014***** %s destroyed *****\n", Ship.shipname);
 	Game.killed = 1;
 	/* let's see what we can blow up!!!! */
 	zap = 20.0 * Ship.energy;
 	Game.deaths += Ship.crew;
-	for (i = 0; i < Etc.nkling; )
+	for (i = 0; i < Etc.nkling; ) {
 		if (Etc.klingon[i].power * Etc.klingon[i].dist <= zap)
 			killk(Etc.klingon[i].x, Etc.klingon[i].y);
 		else
 			i++;
+	}
 	/* if we didn't kill the last Klingon (detected by killk), */
 	/* then we lose.... */
 	lose(L_DSTRCT);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: events.c,v 1.9 2009/05/24 20:39:43 dholland Exp $	*/
+/*	$NetBSD: events.c,v 1.10 2009/05/24 21:44:56 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[] = "@(#)events.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: events.c,v 1.9 2009/05/24 20:39:43 dholland Exp $");
+__RCSID("$NetBSD: events.c,v 1.10 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
 #include "getpar.h"
 #include "trek.h"
 /*
 **  CAUSE TIME TO ELAPSE
 **
 **	This routine does a hell of a lot.  It elapses time, eats up
 @@ -62,58 +62,54 @@ events(int timewarp)
 	int			j = 0;
 	struct kling		*k;
 	double			rtime;
 	double			xdate;
 	double			idate;
 	struct event		*ev = NULL;
 	int			ix, iy;
 	struct quad	*q;
 	struct event	*e;
 	int			evnum;
 	int			restcancel;
 	/* if nothing happened, just allow for any Klingons killed */
-	if (Move.time <= 0.0)
+	if (Move.time <= 0.0) {
 		Now.time = Now.resource / Now.klings;
 		return (0);
+	}
 	/* indicate that the cloaking device is now working */
 	Ship.cloakgood = 1;
 	/* idate is the initial date */
 	idate = Now.date;
 	/* schedule attacks if resting too long */
 	if (Move.time > 0.5 && Move.resting)
 		schedule(E_ATTACK, 0.5, 0, 0, 0);
 	/* scan the event list */
-	while (1)
+	while (1) {
 		restcancel = 0;
 		evnum = -1;
 		/* xdate is the date of the current event */
 		xdate = idate + Move.time;
 		/* find the first event that has happened */
-		for (i = 0; i < MAXEVENTS; i++)
+		for (i = 0; i < MAXEVENTS; i++) {
 			e = &Event[i];
 			if (e->evcode == 0 || (e->evcode & E_GHOST))
 				continue;
-			if (e->date < xdate)
+			if (e->date < xdate) {
 				xdate = e->date;
 				ev = e;
 				evnum = i;
+			}
+		}
 		e = ev;
 		/* find the time between events */
 		rtime = xdate - Now.date;
 		/* decrement the magic "Federation Resources" pseudo-variable */
 		Now.resource -= Now.klings * rtime;
 		/* and recompute the time left */
 @@ -126,48 +122,44 @@ events(int timewarp)
 		if (Now.time <= 0.0)
 			lose(L_NOTIME);
 #ifdef xTRACE
 		if (evnum >= 0 && Trace)
 			printf("xdate = %.2f, evcode %d params %d %d %d\n",
 				xdate, e->evcode, e->x, e->y, e->systemname);
 #endif
 		/* if evnum < 0, no events occurred  */
 		if (evnum < 0)
 			break;
 		/* otherwise one did.  Find out what it is */
-		switch (e->evcode & E_EVENT)
+		switch (e->evcode & E_EVENT) {
 		  case E_SNOVA:			/* supernova */
 			/* cause the supernova to happen */
 			snova(-1, 0);
 			/* and schedule the next one */
 			xresched(e, E_SNOVA, 1);
 			break;
 		  case E_LRTB:			/* long range tractor beam */
 			/* schedule the next one */
 			xresched(e, E_LRTB, Now.klings);
 			/* LRTB cannot occur if we are docked */
-			if (Ship.cond != DOCKED)
+			if (Ship.cond != DOCKED) {
 				/* pick a new quadrant */
 				i = ranf(Now.klings) + 1;
-				for (ix = 0; ix < NQUADS; ix++)
+				for (ix = 0; ix < NQUADS; ix++) {
 					for (iy = 0; iy < NQUADS; iy++) {
 					for (iy = 0; iy < NQUADS; iy++)
 						q = &Quad[ix][iy];
 						if (q->stars >= 0)
 							if ((i -= q->klings) <= 0)
 								break;
+					}
 					if (i <= 0)
 						break;
+				}
 				/* test for LRTB to same quadrant */
 				if (Ship.quadx == ix && Ship.quady == iy)
 					break;
 @@ -176,215 +168,201 @@ events(int timewarp)
 				Ship.quady = iy;
 				printf("\n%s caught in long range tractor beam\n", Ship.shipname);
 				printf("*** Pulled to quadrant %d,%d\n", Ship.quadx, Ship.quady);
 				Ship.sectx = ranf(NSECTS);
 				Ship.secty = ranf(NSECTS);
 				initquad(0);
 				/* truncate the move time */
 				Move.time = xdate - idate;
+			}
 			break;
 		  case E_KATSB:			/* Klingon attacks starbase */
 			/* if out of bases, forget it */
-			if (Now.bases <= 0)
+			if (Now.bases <= 0) {
 				unschedule(e);
 				break;
+			}
 			/* check for starbase and Klingons in same quadrant */
-			for (i = 0; i < Now.bases; i++)
+			for (i = 0; i < Now.bases; i++) {
 				ix = Now.base[i].x;
 				iy = Now.base[i].y;
 				/* see if a Klingon exists in this quadrant */
 				q = &Quad[ix][iy];
 				if (q->klings <= 0)
 					continue;
 				/* see if already distressed */
-				for (j = 0; j < MAXEVENTS; j++)
+				for (j = 0; j < MAXEVENTS; j++) {
 					e = &Event[j];
 					if ((e->evcode & E_EVENT) != E_KDESB)
 						continue;
 					if (e->x == ix && e->y == iy)
 						break;
+				}
 				if (j < MAXEVENTS)
 					continue;
 				/* got a potential attack */
 				break;
+			}
 			e = ev;
-			if (i >= Now.bases)
+			if (i >= Now.bases) {
 				/* not now; wait a while and see if some Klingons move in */
 				reschedule(e, 0.5 + 3.0 * franf());
 				break;
+			}
 			/* schedule a new attack, and a destruction of the base */
 			xresched(e, E_KATSB, 1);
 			e = xsched(E_KDESB, 1, ix, iy, 0);
 			/* report it if we can */
-			if (!damaged(SSRADIO))
+			if (!damaged(SSRADIO)) {
 				printf("\nUhura:  Captain, we have received a distress signal\n");
 				printf("  from the starbase in quadrant %d,%d.\n",
 					ix, iy);
 				restcancel++;
 			} else {
 			else
 				/* SSRADIO out, make it so we can't see the distress call */
 				/* but it's still there!!! */
 				e->evcode |= E_HIDDEN;
+			}
 			break;
 		  case E_KDESB:			/* Klingon destroys starbase */
 			unschedule(e);
 			q = &Quad[e->x][e->y];
 			/* if the base has mysteriously gone away, or if the Klingon
 			   got tired and went home, ignore this event */
 			if (q->bases <=0 || q->klings <= 0)
 				break;
 			/* are we in the same quadrant? */
-			if (e->x == Ship.quadx && e->y == Ship.quady)
+			if (e->x == Ship.quadx && e->y == Ship.quady) {
 				/* yep, kill one in this quadrant */
 				printf("\nSpock: ");
 				killb(Ship.quadx, Ship.quady);
 			} else {
 			else
 				/* kill one in some other quadrant */
 				killb(e->x, e->y);
+			}
 			break;
 		  case E_ISSUE:		/* issue a distress call */
 			xresched(e, E_ISSUE, 1);
 			/* if we already have too many, throw this one away */
 			if (Ship.distressed >= MAXDISTR)
 				break;
 			/* try a whole bunch of times to find something suitable */
-			for (i = 0; i < 100; i++)
+			for (i = 0; i < 100; i++) {
 				ix = ranf(NQUADS);
 				iy = ranf(NQUADS);
 				q = &Quad[ix][iy];
 				/* need a quadrant which is not the current one,
 				   which has some stars which are inhabited and
 				   not already under attack, which is not
 				   supernova'ed, and which has some Klingons in it */
 				if (!((ix == Ship.quadx && iy == Ship.quady) || q->stars < 0 ||
 				    (q->qsystemname & Q_DISTRESSED) ||
 				    (q->qsystemname & Q_SYSTEM) == 0 || q->klings <= 0))
 					break;
+			}
 			if (i >= 100)
 				/* can't seem to find one; ignore this call */
 				break;
 			/* got one!!  Schedule its enslavement */
 			Ship.distressed++;
 			e = xsched(E_ENSLV, 1, ix, iy, q->qsystemname);
 			q->qsystemname = (e - Event) | Q_DISTRESSED;
 			/* tell the captain about it if we can */
-			if (!damaged(SSRADIO))
+			if (!damaged(SSRADIO)) {
 				printf("\nUhura: Captain, starsystem %s in quadrant %d,%d is under attack\n",
 					Systemname[e->systemname], ix, iy);
 				restcancel++;
 			} else {
 			else
 				/* if we can't tell him, make it invisible */
 				e->evcode |= E_HIDDEN;
+			}
 			break;
 		  case E_ENSLV:		/* starsystem is enslaved */
 			unschedule(e);
 			/* see if current distress call still active */
 			q = &Quad[e->x][e->y];
-			if (q->klings <= 0)
+			if (q->klings <= 0) {
 				/* no Klingons, clean up */
 				/* restore the system name */
 				q->qsystemname = e->systemname;
 				break;
+			}
 			/* play stork and schedule the first baby */
 			e = schedule(E_REPRO, Param.eventdly[E_REPRO] * franf(), e->x, e->y, e->systemname);
 			/* report the disaster if we can */
-			if (!damaged(SSRADIO))
+			if (!damaged(SSRADIO)) {
 				printf("\nUhura:  We've lost contact with starsystem %s\n",
 					Systemname[e->systemname]);
 				printf("  in quadrant %d,%d.\n",
 					e->x, e->y);
 			} else
 			else
 				e->evcode |= E_HIDDEN;
 			break;
 		  case E_REPRO:		/* Klingon reproduces */
 			/* see if distress call is still active */
 			q = &Quad[e->x][e->y];
-			if (q->klings <= 0)
+			if (q->klings <= 0) {
 				unschedule(e);
 				q->qsystemname = e->systemname;
 				break;
+			}
 			xresched(e, E_REPRO, 1);
 			/* reproduce one Klingon */
 			ix = e->x;
 			iy = e->y;
-			if (Now.klings == 127)
+			if (Now.klings == 127) {
-				break;		/* full right now */
+				/* full right now */
-			if (q->klings >= MAXKLQUAD)
+				break;
+			}
 			if (q->klings >= MAXKLQUAD) {
 				/* this quadrant not ok, pick an adjacent one */
-				for (i = ix - 1; i <= ix + 1; i++)
+				for (i = ix - 1; i <= ix + 1; i++) {
 					if (i < 0 || i >= NQUADS)
 						continue;
-					for (j = iy - 1; j <= iy + 1; j++)
+					for (j = iy - 1; j <= iy + 1; j++) {
 						if (j < 0 || j >= NQUADS)
 							continue;
 						q = &Quad[i][j];
 						/* check for this quad ok (not full & no snova) */
 						if (q->klings >= MAXKLQUAD || q->stars < 0)
 							continue;
 						break;
+					}
 					if (j <= iy + 1)
 						break;
+				}
 				if (j > iy + 1)
 					/* cannot create another yet */
 					break;
 				ix = i;
 				iy = j;
+			}
 			/* deliver the child */
 			q->klings++;
 			Now.klings++;
-			if (ix == Ship.quadx && iy == Ship.quady)
+			if (ix == Ship.quadx && iy == Ship.quady) {
 				/* we must position Klingon */
 				sector(&ix, &iy);
 				Sect[ix][iy] = KLINGON;
 				k = &Etc.klingon[Etc.nkling++];
 				k->x = ix;
 				k->y = iy;
 				k->power = Param.klingpwr;
 				k->srndreq = 0;
 				compkldist(Etc.klingon[0].dist == Etc.klingon[0].avgdist ? 0 : 1);
+			}
 			/* recompute time left */
 			Now.time = Now.resource / Now.klings;
 @@ -392,46 +370,44 @@ events(int timewarp)
 		  case E_SNAP:		/* take a snapshot of the galaxy */
 			xresched(e, E_SNAP, 1);
 			p = (char *) Etc.snapshot;
 			memcpy(p, Quad, sizeof (Quad));
 			p += sizeof(Quad);
 			memcpy(p, Event, sizeof (Event));
 			p += sizeof(Event);
 			memcpy(p, &Now, sizeof (Now));
 			Game.snap = 1;
 			break;
 		  case E_ATTACK:	/* Klingons attack during rest period */
-			if (!Move.resting)
+			if (!Move.resting) {
 				unschedule(e);
 				break;
+			}
 			attack(1);
 			reschedule(e, 0.5);
 			break;
 		  case E_FIXDV:
 			i = e->systemname;
 			unschedule(e);
 			/* de-damage the device */
 			printf("%s reports repair work on the %s finished.\n",
 				Device[i].person, Device[i].name);
 			/* handle special processing upon fix */
-			switch (i)
+			switch (i) {
 			  case LIFESUP:
 				Ship.reserves = Param.reserves;
 				break;
 			  case SINS:
 				if (Ship.cond == DOCKED)
 					break;
 				printf("Spock has tried to recalibrate your Space Internal Navigation System,\n");
 				printf("  but he has no standard base to calibrate to.  Suggest you get\n");
 				printf("  to a starbase immediately so that you can properly recalibrate.\n");
 				Ship.sinsbad = 1;
 				break;
 @@ -445,28 +421,27 @@ events(int timewarp)
 		  default:
 			break;
+		}
 		if (restcancel && Move.resting && getynpar("Spock: Shall we cancel our rest period"))
 			Move.time = xdate - idate;
+	}
 	/* unschedule an attack during a rest period */
 	if ((e = Now.eventptr[E_ATTACK]) != NULL)
 		unschedule(e);
-	if (!timewarp)
+	if (!timewarp) {
 		/* eat up energy if cloaked */
 		if (Ship.cloaked)
 			Ship.energy -= Param.cloakenergy * Move.time;
 		/* regenerate resources */
 		rtime = 1.0 - exp(-Param.regenfac * Move.time);
 		Ship.shield += (Param.shield - Ship.shield) * rtime;
 		Ship.energy += (Param.energy - Ship.energy) * rtime;
 		/* decrement life support reserves */
 		if (damaged(LIFESUP) && Ship.cond != DOCKED)
 			Ship.reserves -= Move.time;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: externs.c,v 1.9 2009/05/24 20:39:43 dholland Exp $	*/
+/*	$NetBSD: externs.c,v 1.10 2009/05/24 21:44:56 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,58 +24,56 @@
  * 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[] = "@(#)externs.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: externs.c,v 1.9 2009/05/24 20:39:43 dholland Exp $");
+__RCSID("$NetBSD: externs.c,v 1.10 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include "trek.h"
 /*
 **	global variable definitions
 */
-const struct device	Device[NDEV] =
+const struct device Device[NDEV] = {
 	{ "warp drive",		"Scotty" },
 	{ "S.R. scanners",	"Scotty" },
 	{ "L.R. scanners",	"Scotty" },
 	{ "phasers",		"Sulu" },
 	{ "photon tubes",	"Sulu" },
 	{ "impulse engines",	"Scotty" },
 	{ "shield control",	"Sulu" },
 	{ "computer",		"Spock" },
 	{ "subspace radio",	"Uhura" },
 	{ "life support",	"Scotty" },
 	{ "navigation system",	"Chekov" },
 	{ "cloaking device",	"Scotty" },
 	{ "transporter",	"Scotty" },
 	{ "shuttlecraft",	"Scotty" },
 	{ "*ERR 14*",		"Nobody" },
 	{ "*ERR 15*",		"Nobody" }
 };
-const char	*const Systemname[NINHAB] =
+const char *const Systemname[NINHAB] = {
 	"ERROR",
 	"Talos IV",
 	"Rigel III",
 	"Deneb VII",
 	"Canopus V",
 	"Icarus I",
 	"Prometheus II",
 	"Omega VII",
 	"Elysium I",
 	"Scalos IV",
 	"Procyon IV",
 	"Arachnid I",
 	"Argo VIII",
 @@ -95,23 +93,24 @@ const char	*const Systemname[NINHAB] =
 	"Ardana",
 	"Stratos",
 	"Eden",
 	"Arrikis",
 	"Epsilon Eridani IV",
 	"Exo III"
 };
 struct quad	Quad[NQUADS][NQUADS];
 /* current sector map */
 char	Sect[NSECTS][NSECTS];
-struct event	Event[MAXEVENTS];	/* dynamic event list; one entry per pending event */
+/* dynamic event list; one entry per pending event */
 struct event Event[MAXEVENTS];
 struct Ship_struct Ship;
 struct Game_struct Game;
 struct Move_struct Move;
 struct Param_struct Param;
 struct Now_struct Now;
 struct Etc_struct Etc;
 int Trace;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kill.c,v 1.9 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: kill.c,v 1.10 2009/05/24 21:44:56 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[] = "@(#)kill.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: kill.c,v 1.9 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: kill.c,v 1.10 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <limits.h>
 #include "trek.h"
 /*
 **  KILL KILL KILL !!!
 **
 **	This file handles the killing off of almost anything.
 */
 @@ -65,28 +65,27 @@ killk(int ix, int iy)
 	printf("   *** Klingon at %d,%d destroyed ***\n", ix, iy);
 	/* remove the scoundrel */
 	Now.klings -= 1;
 	Sect[ix][iy] = EMPTY;
 	Quad[Ship.quadx][Ship.quady].klings -= 1;
 	/* %%% IS THIS SAFE???? %%% */
 	Quad[Ship.quadx][Ship.quady].scanned -= 100;
 	Game.killk += 1;
 	/* find the Klingon in the Klingon list */
 	for (i = 0; i < Etc.nkling; i++)
-		if (ix == Etc.klingon[i].x && iy == Etc.klingon[i].y)
+		if (ix == Etc.klingon[i].x && iy == Etc.klingon[i].y) {
 			/* purge him from the list */
 			Etc.nkling -= 1;
 			for (; i < Etc.nkling; i++)
 				Etc.klingon[i] = Etc.klingon[i+1];
 			break;
+		}
 	/* find out if that was the last one */
 	if (Now.klings <= 0)
 		win();
 	/* recompute time left */
 	Now.time = Now.resource / Now.klings;
 @@ -112,125 +111,111 @@ killb(int qx, int qy)
 		/* then update starchart */
 		if (q->scanned < 1000)
 			q->scanned -= 10;
 		else
 			if (q->scanned > 1000)
 				q->scanned = -1;
+	}
 	q->bases = 0;
 	Now.bases -= 1;
 	for (b = Now.base; ; b++)
 		if (qx == b->x && qy == b->y)
 			break;
 	*b = Now.base[Now.bases];
-	if (qx == Ship.quadx && qy == Ship.quady)
+	if (qx == Ship.quadx && qy == Ship.quady) {
 		Sect[Etc.starbase.x][Etc.starbase.y] = EMPTY;
 		if (Ship.cond == DOCKED)
 			undock(0);
 		printf("Starbase at %d,%d destroyed\n", Etc.starbase.x, Etc.starbase.y);
 	} else {
-	else
+		if (!damaged(SSRADIO)) {
 		if (!damaged(SSRADIO))
 			printf("Uhura: Starfleet command reports that the starbase in\n");
 			printf("   quadrant %d,%d has been destroyed\n", qx, qy);
+		}
 		else
 			schedule(E_KATSB | E_GHOST, TOOLARGE, qx, qy, 0);
+	}
+}
 /**
  **	kill an inhabited starsystem
  **
  ** x, y are quad coords if f == 0, else sector coords
  ** f != 0 -- this quad;  f < 0 -- Enterprise's fault
  **/
 void
 kills(int x, int y, int f)
+{
 	struct quad	*q;
 	struct event	*e;
 	const char	*name;
-	if (f)
+	if (f) {
 		/* current quadrant */
 		q = &Quad[Ship.quadx][Ship.quady];
 		Sect[x][y] = EMPTY;
 		name = systemname(q);
 		if (name == 0)
 			return;
 		printf("Inhabited starsystem %s at %d,%d destroyed\n",
 			name, x, y);
 		if (f < 0)
 			Game.killinhab += 1;
 	} else {
 	else
 		/* different quadrant */
 		q = &Quad[x][y];
+	}
-	if (q->qsystemname & Q_DISTRESSED)
+	if (q->qsystemname & Q_DISTRESSED) {
 		/* distressed starsystem */
 		e = &Event[q->qsystemname & Q_SYSTEM];
 		printf("Distress call for %s invalidated\n",
 			Systemname[e->systemname]);
 		unschedule(e);
+	}
 	q->qsystemname = 0;
 	q->stars -= 1;
+}
 /**
  **	"kill" a distress call
  **
  ** x, y are quadrant coordinates
  ** f is set if user is to be informed
  **/
 void
 killd(int x, int y, int f)
+{
 	struct event	*e;
 	int		i;
 	struct quad	*q;
 	q = &Quad[x][y];
-	for (i = 0; i < MAXEVENTS; i++)
+	for (i = 0; i < MAXEVENTS; i++) {
 		e = &Event[i];
 		if (e->x != x || e->y != y)
 			continue;
-		switch (e->evcode)
+		switch (e->evcode) {
 		  case E_KDESB:
-			if (f)
+			if (f) {
 				printf("Distress call for starbase in %d,%d nullified\n",
 					x, y);
 				unschedule(e);
+			}
 			break;
 		  case E_ENSLV:
 		  case E_REPRO:
-			if (f)
+			if (f) {
 				printf("Distress call for %s in quadrant %d,%d nullified\n",
 					Systemname[e->systemname], x, y);
 				q->qsystemname = e->systemname;
 				unschedule(e);
 			} else {
 			else
 				e->evcode |= E_GHOST;
+			}
+		}
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: shield.c,v 1.9 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: shield.c,v 1.10 2009/05/24 21:44:56 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,120 +24,110 @@
  * 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[] = "@(#)shield.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: shield.c,v 1.9 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: shield.c,v 1.10 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  SHIELD AND CLOAKING DEVICE CONTROL
 **
 **	'f' is one for auto shield up (in case of Condition RED),
 **	zero for shield control, and negative one for cloaking
 **	device control.
 **
 **	Called with an 'up' or 'down' on the same line, it puts
 **	the shields/cloak into the specified mode.  Otherwise it
 **	reports to the user the current mode, and asks if she wishes
 **	to change.
 **
 **	This is not a free move.  Hits that occur as a result of
 **	this move appear as though the shields are half up/down,
 **	so you get partial hits.
 */
-const struct cvntab Udtab[] =
+const struct cvntab Udtab[] = {
 	{ "u",		"p",		(cmdfun)1,	0 },
 	{ "d",		"own",		(cmdfun)0,	0 },
 	{ NULL,		NULL,		NULL,		0 }
 };
 void
 shield(int f)
+{
 	int		i;
 	const struct cvntab	*r;
 	char		s[100];
 	const char	*device, *dev2, *dev3;
 	int		ind;
 	char		*stat;
 	if (f > 0 && (Ship.shldup || damaged(SRSCAN)))
 		return;
-	if (f < 0)
+	if (f < 0) {
 		/* cloaking device */
 		if (Ship.ship == QUEENE) {
 			printf("Ye Faire Queene does not have the cloaking device.\n");
 			return;
+		}
 		device = "Cloaking device";
 		dev2 = "is";
 		ind = CLOAK;
 		dev3 = "it";
 		stat = &Ship.cloaked;
 	} else {
 	else
 		/* shields */
 		device = "Shields";
 		dev2 = "are";
 		dev3 = "them";
 		ind = SHIELD;
 		stat = &Ship.shldup;
+	}
-	if (damaged(ind))
+	if (damaged(ind)) {
 		if (f <= 0)
 			out(ind);
 		return;
+	}
-	if (Ship.cond == DOCKED)
+	if (Ship.cond == DOCKED) {
 		printf("%s %s down while docked\n", device, dev2);
 		return;
+	}
-	if (f <= 0 && !testnl())
+	if (f <= 0 && !testnl()) {
 		r = getcodpar("Up or down", Udtab);
 		i = (long) r->value;
 	} else {
 	else
 		if (*stat)
 			(void)sprintf(s, "%s %s up.  Do you want %s down", device, dev2, dev3);
 		else
 			(void)sprintf(s, "%s %s down.  Do you want %s up", device, dev2, dev3);
 		if (!getynpar(s))
 			return;
 		i = !*stat;
+	}
-	if (*stat == i)
+	if (*stat == i) {
 		printf("%s already ", device);
 		if (i)
 			printf("up\n");
 		else
 			printf("down\n");
 		return;
+	}
 	if (i) {
 		if (f >= 0)
 			Ship.energy -= Param.shupengy;
 		else
 			Ship.cloakgood = 0;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: warp.c,v 1.9 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: warp.c,v 1.10 2009/05/24 21:44:56 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[] = "@(#)warp.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: warp.c,v 1.9 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: warp.c,v 1.10 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  MOVE UNDER WARP POWER
 **
 @@ -79,105 +79,97 @@ warp(int fl, int c, double d)
 	int		course;
 	double		power;
 	double		dist;
 	double		time;
 	double		speed;
 	double		frac;
 	int		percent;
 	int		i;
 	if (Ship.cond == DOCKED) {
 		printf("%s is docked\n", Ship.shipname);
 		return;
+	}
-	if (damaged(WARP))
+	if (damaged(WARP)) {
 		out(WARP);
 		return;
+	}
 	course = c;
 	dist = d;
 	/* check to see that we are not using an absurd amount of power */
 	power = (dist + 0.05) * Ship.warp3;
 	percent = 100 * power / Ship.energy + 0.5;
-	if (percent >= 85)
+	if (percent >= 85) {
 		printf("Scotty: That would consume %d%% of our remaining energy.\n",
 			percent);
 		if (!getynpar("Are you sure that is wise"))
 			return;
+	}
 	/* compute the speed we will move at, and the time it will take */
 	speed = Ship.warp2 / Param.warptime;
 	time = dist / speed;
 	/* check to see that that value is not ridiculous */
 	percent = 100 * time / Now.time + 0.5;
-	if (percent >= 85)
+	if (percent >= 85) {
 		printf("Spock: That would take %d%% of our remaining time.\n",
 			percent);
 		if (!getynpar("Are you sure that is wise"))
 			return;
+	}
 	/* compute how far we will go if we get damages */
-	if (Ship.warp > 6.0 && ranf(100) < 20 + 15 * (Ship.warp - 6.0))
+	if (Ship.warp > 6.0 && ranf(100) < 20 + 15 * (Ship.warp - 6.0)) {
 		frac = franf();
 		dist *= frac;
 		time *= frac;
 		damage(WARP, (frac + 1.0) * Ship.warp * (franf() + 0.25) * 0.20);
+	}
 	/* do the move */
 	Move.time = move(fl, course, time, speed);
 	/* see how far we actually went, and decrement energy appropriately */
 	dist = Move.time * speed;
 	Ship.energy -= dist * Ship.warp3 * (Ship.shldup + 1);
 	/* test for bizarre events */
 	if (Ship.warp <= 9.0)
 		return;
 	printf("\n\n  ___ Speed exceeding warp nine ___\n\n");
 	sleep(2);
 	printf("Ship's safety systems malfunction\n");
 	sleep(2);
 	printf("Crew experiencing extreme sensory distortion\n");
 	sleep(4);
-	if (ranf(100) >= 100 * dist)
+	if (ranf(100) >= 100 * dist) {
 		printf("Equilibrium restored -- all systems normal\n");
 		return;
+	}
 	/* select a bizzare thing to happen to us */
 	percent = ranf(100);
-	if (percent < 70)
+	if (percent < 70) {
 		/* time warp */
-		if (percent < 35 || !Game.snap)
+		if (percent < 35 || !Game.snap) {
 			/* positive time warp */
 			time = (Ship.warp - 8.0) * dist * (franf() + 1.0);
 			Now.date += time;
 			printf("Positive time portal entered -- it is now Stardate %.2f\n",
 				Now.date);
-			for (i = 0; i < MAXEVENTS; i++)
+			for (i = 0; i < MAXEVENTS; i++) {
 				percent = Event[i].evcode;
 				if (percent == E_FIXDV || percent == E_LRTB)
 					Event[i].date += time;
+			}
 			return;
+		}
 		/* s/he got lucky: a negative time portal */
 		time = Now.date;
 		p = (char *) Etc.snapshot;
 		memcpy(p, Quad, sizeof Quad);
 		p += sizeof Quad;
 		memcpy(p, Event, sizeof Event);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compkl.c,v 1.7 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: compkl.c,v 1.8 2009/05/24 21:44:56 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[] = "@(#)compkl.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: compkl.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: compkl.c,v 1.8 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <math.h>
 #include "trek.h"
 /*
 **  compute klingon distances
 **
 **	The klingon list has the distances for all klingons recomputed
 **	and sorted.  The parameter is a Boolean flag which is set if
 **	we have just entered a new quadrant.
 **
 @@ -55,67 +55,62 @@ __RCSID("$NetBSD: compkl.c,v 1.7 2009/05
 */
 static void sortkl(void);
 void
 compkldist(int f)
+{
 	int		i, dx, dy;
 	double		d;
 	double		temp;
 	if (Etc.nkling == 0)
 		return;
-	for (i = 0; i < Etc.nkling; i++)
+	for (i = 0; i < Etc.nkling; i++) {
 		/* compute distance to the Klingon */
 		dx = Ship.sectx - Etc.klingon[i].x;
 		dy = Ship.secty - Etc.klingon[i].y;
 		d = dx * dx + dy * dy;
 		d = sqrt(d);
 		/* compute average of new and old distances to Klingon */
-		if (!f)
+		if (!f) {
 			temp = Etc.klingon[i].dist;
 			Etc.klingon[i].avgdist = 0.5 * (temp + d);
 		} else {
 		else
 			/* new quadrant: average is current */
 			Etc.klingon[i].avgdist = d;
+		}
 		Etc.klingon[i].dist = d;
+	}
 	/* leave them sorted */
 	sortkl();
+}
 /*
 **  sort klingons
 **
 **	bubble sort on ascending distance
 */
 static void
 sortkl(void)
+{
 	struct kling		t;
 	int		f, i, m;
 	m = Etc.nkling - 1;
 	f = 1;
-	while (f)
+	while (f) {
 		f = 0;
-		for (i = 0; i < m; i++)
+		for (i = 0; i < m; i++) {
-			if (Etc.klingon[i].dist > Etc.klingon[i+1].dist)
+			if (Etc.klingon[i].dist > Etc.klingon[i+1].dist) {
 				t =  Etc.klingon[i];
 				Etc.klingon[i] = Etc.klingon[i+1];
 				Etc.klingon[i+1] = t;
 				f = 1;
+			}
+		}
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: damage.c,v 1.7 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: damage.c,v 1.8 2009/05/24 21:44:56 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[] = "@(#)damage.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: damage.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: damage.c,v 1.8 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <err.h>
 #include "trek.h"
 /*
 **  Schedule Ship.damages to a Device
 **
 **	Device `dev1' is damaged in an amount `dam'.  Dam is measured
 **	in stardates, and is an additional amount of damage.  It should
 **	be the amount to occur in non-docked mode.  The adjustment
 @@ -67,32 +67,30 @@ damage(int dev1, double dam)
 	/* ignore zero damages */
 	if (dam <= 0.0)
 		return;
 	dev = dev1;
 	printf("\t%s damaged\n", Device[dev].name);
 	/* find actual length till it will be fixed */
 	if (Ship.cond == DOCKED)
 		dam *= Param.dockfac;
 	/* set the damage flag */
 	f = damaged(dev);
-	if (!f)
+	if (!f) {
 		/* new damages -- schedule a fix */
 		schedule(E_FIXDV, dam, 0, 0, dev);
 		return;
+	}
 	/* device already damaged -- add to existing damages */
 	/* scan for old damages */
-	for (i = 0; i < MAXEVENTS; i++)
+	for (i = 0; i < MAXEVENTS; i++) {
 		e = &Event[i];
 		if (e->evcode != E_FIXDV || e->systemname != dev)
 			continue;
 		/* got the right one; add on the new damages */
 		reschedule(e, e->date - Now.date + dam);
 		return;
+	}
 	errx(1, "Cannot find old damages %d", dev);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: klmove.c,v 1.7 2009/05/24 20:39:43 dholland Exp $	*/
+/*	$NetBSD: klmove.c,v 1.8 2009/05/24 21:44:56 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[] = "@(#)klmove.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: klmove.c,v 1.7 2009/05/24 20:39:43 dholland Exp $");
+__RCSID("$NetBSD: klmove.c,v 1.8 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 /*
 **  Move Klingons Around
 **
 **	This is a largely incomprehensible block of code that moves
 **	Klingons around in a quadrant.  It was written in a very
 **	"program as you go" fashion, and is a prime candidate for
 **	rewriting.
 @@ -72,115 +72,106 @@ klmove(int fl)
 	double			dx, dy;
 	int			nextx, nexty;
 	int		lookx, looky;
 	int			motion;
 	int			fudgex, fudgey;
 	int			qx, qy;
 	double			bigger;
 	int			i;
 #ifdef xTRACE
 	if (Trace)
 		printf("klmove: fl = %d, Etc.nkling = %d\n", fl, Etc.nkling);
 #endif
-	for (n = 0; n < Etc.nkling; n++)
+	for (n = 0; n < Etc.nkling; n++) {
 		k = &Etc.klingon[n];
 		i = 100;
 		if (fl)
 			i = 100.0 * k->power / Param.klingpwr;
 		if (ranf(i) >= Param.moveprob[2 * Move.newquad + fl])
 			continue;
 		/* compute distance to move */
 		motion = ranf(75) - 25;
 		motion *= k->avgdist * Param.movefac[2 * Move.newquad + fl];
 		/* compute direction */
 		dx = Ship.sectx - k->x + ranf(3) - 1;
 		dy = Ship.secty - k->y + ranf(3) - 1;
 		bigger = dx;
 		if (dy > bigger)
 			bigger = dy;
 		if (bigger == 0.0)
 			bigger = 1.0;
 		dx = dx / bigger + 0.5;
 		dy = dy / bigger + 0.5;
-		if (motion < 0)
+		if (motion < 0) {
 			motion = -motion;
 			dx = -dx;
 			dy = -dy;
+		}
 		fudgex = fudgey = 1;
 		/* try to move the klingon */
 		nextx = k->x;
 		nexty = k->y;
-		for (; motion > 0; motion--)
+		for (; motion > 0; motion--) {
 			lookx = nextx + dx;
 			looky = nexty + dy;
-			if (lookx < 0 || lookx >= NSECTS || looky < 0 || looky >= NSECTS)
+			if (lookx < 0 || lookx >= NSECTS || looky < 0 || looky >= NSECTS) {
 				/* new quadrant */
 				qx = Ship.quadx;
 				qy = Ship.quady;
 				if (lookx < 0)
 					qx -= 1;
 				else
 					if (lookx >= NSECTS)
 						qx += 1;
 				if (looky < 0)
 					qy -= 1;
 				else
 					if (looky >= NSECTS)
 						qy += 1;
 				if (qx < 0 || qx >= NQUADS || qy < 0 || qy >= NQUADS ||
 						Quad[qx][qy].stars < 0 || Quad[qx][qy].klings > MAXKLQUAD - 1)
 					break;
-				if (!damaged(SRSCAN))
+				if (!damaged(SRSCAN)) {
 					printf("Klingon at %d,%d escapes to quadrant %d,%d\n",
 						k->x, k->y, qx, qy);
 					motion = Quad[qx][qy].scanned;
 					if (motion >= 0 && motion < 1000)
 						Quad[qx][qy].scanned += 100;
 					motion = Quad[Ship.quadx][Ship.quady].scanned;
 					if (motion >= 0 && motion < 1000)
 						Quad[Ship.quadx][Ship.quady].scanned -= 100;
+				}
 				Sect[k->x][k->y] = EMPTY;
 				Quad[qx][qy].klings += 1;
 				Etc.nkling -= 1;
 				*k = Etc.klingon[Etc.nkling];
 				Quad[Ship.quadx][Ship.quady].klings -= 1;
 				k = 0;
 				break;
+			}
-			if (Sect[lookx][looky] != EMPTY)
+			if (Sect[lookx][looky] != EMPTY) {
 				lookx = nextx + fudgex;
 				if (lookx < 0 || lookx >= NSECTS)
 					lookx = nextx + dx;
-				if (Sect[lookx][looky] != EMPTY)
+				if (Sect[lookx][looky] != EMPTY) {
 					fudgex = -fudgex;
 					looky = nexty + fudgey;
-					if (looky < 0 || looky >= NSECTS || Sect[lookx][looky] != EMPTY)
+					if (looky < 0 || looky >= NSECTS || Sect[lookx][looky] != EMPTY) {
 						fudgey = -fudgey;
 						break;
+					}
+				}
+			}
 			nextx = lookx;
 			nexty = looky;
+		}
-		if (k && (k->x != nextx || k->y != nexty))
+		if (k && (k->x != nextx || k->y != nexty)) {
 			if (!damaged(SRSCAN))
 				printf("Klingon at %d,%d moves to %d,%d\n",
 					k->x, k->y, nextx, nexty);
 			Sect[k->x][k->y] = EMPTY;
 			Sect[k->x = nextx][k->y = nexty] = KLINGON;
+		}
+	}
 	compkldist(0);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nova.c,v 1.7 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: nova.c,v 1.8 2009/05/24 21:44:56 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[] = "@(#)nova.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: nova.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: nova.c,v 1.8 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include "trek.h"
 /*
 **  CAUSE A NOVA TO OCCUR
 **
 **	A nova occurs.  It is the result of having a star hit with
 **	a photon torpedo.  There are several things which may happen.
 **	The star may not be affected.  It may go nova.  It may turn
 **	into a black hole.  Any (yummy) it may go supernova.
 @@ -53,57 +53,52 @@ __RCSID("$NetBSD: nova.c,v 1.7 2009/05/2
 **	the same probabilistic process.  Klingons next to them are
 **	destroyed.  And if the starship is next to it, it gets zapped.
 **	If the zap is too much, it gets destroyed.
 */
 void
 nova(int x, int y)
+{
 	int	i, j;
 	int	se;
 	if (Sect[x][y] != STAR || Quad[Ship.quadx][Ship.quady].stars < 0)
 		return;
-	if (ranf(100) < 15)
+	if (ranf(100) < 15) {
 		printf("Spock: Star at %d,%d failed to nova.\n", x, y);
 		return;
+	}
 	if (ranf(100) < 5) {
 		snova(x, y);
 		return;
+	}
 	printf("Spock: Star at %d,%d gone nova\n", x, y);
-	if (ranf(4) != 0)
+	if (ranf(4) != 0) {
 		Sect[x][y] = EMPTY;
-	else
+	} else {
 		Sect[x][y] = HOLE;
 		Quad[Ship.quadx][Ship.quady].holes += 1;
+	}
 	Quad[Ship.quadx][Ship.quady].stars -= 1;
 	Game.kills += 1;
-	for (i = x - 1; i <= x + 1; i++)
+	for (i = x - 1; i <= x + 1; i++) {
 		if (i < 0 || i >= NSECTS)
 			continue;
-		for (j = y - 1; j <= y + 1; j++)
+		for (j = y - 1; j <= y + 1; j++) {
 			if (j < 0 || j >= NSECTS)
 				continue;
 			se = Sect[i][j];
-			switch (se)
+			switch (se) {
 			  case EMPTY:
 			  case HOLE:
 				break;
 			  case KLINGON:
 				killk(i, j);
 				break;
 			  case STAR:
 				nova(i, j);
 				break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: srscan.c,v 1.7 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: srscan.c,v 1.8 2009/05/24 21:44:56 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,112 +24,103 @@
  * 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.7 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: srscan.c,v 1.8 2009/05/24 21:44:56 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] =
+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))
+	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++)
+	for (i = 0; i < NSECTS; i++) {
 		if (f >= 0) {
 		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)
+			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);
 @@ -147,38 +138,36 @@ srscan(int f)
 				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))
+				if (damaged(LIFESUP)) {
 					printf("damaged, reserves = %.2f", Ship.reserves);
 					break;
+				}
 				printf("active");
 				break;
+			}
 		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);
 		p = &Skitab[Game.skill - 1];
 		printf("%s%s\n", p->abrev, p->full);
 		return;
+	}
 	printf("  ");
 	for (i = 0; i < NSECTS; i++)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: computer.c,v 1.12 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: computer.c,v 1.13 2009/05/24 21:44:56 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[] = "@(#)computer.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: computer.c,v 1.12 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: computer.c,v 1.13 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  On-Board Computer
 **
 **	A computer request is fetched from the captain.  The requests
 @@ -80,28 +80,27 @@ __RCSID("$NetBSD: computer.c,v 1.12 2009
 **		a given distance under a given warp speed.
 **
 **	impcost -- Same for the impulse engines.
 **
 **	distresslist -- Gives a list of the currently known starsystems
 **		or starbases which are distressed, together with their
 **		quadrant coordinates.
 **
 **	If a command is terminated with a semicolon, you remain in
 **	the computer; otherwise, you escape immediately to the main
 **	command processor.
 */
-struct cvntab	Cputab[] =
+struct cvntab Cputab[] = {
 	{ "ch",		"art",			(cmdfun)1,		0 },
 	{ "t",		"rajectory",		(cmdfun)2,		0 },
 	{ "c",		"ourse",		(cmdfun)3,		0 },
 	{ "m",		"ove",			(cmdfun)3,		1 },
 	{ "s",		"core",			(cmdfun)4,		0 },
 	{ "p",		"heff",			(cmdfun)5,		0 },
 	{ "w",		"arpcost",		(cmdfun)6,		0 },
 	{ "i",		"mpcost",		(cmdfun)7,		0 },
 	{ "d",		"istresslist",		(cmdfun)8,		0 },
 	{ NULL,		NULL,			NULL,			0 }
 };
 static int kalc(int, int, int, int, double *);
 @@ -114,116 +113,104 @@ computer(int v __unused)
 	int		ix, iy;
 	int		i, j;
 	int		tqx, tqy;
 	const struct cvntab	*r;
 	int		cost;
 	int		course;
 	double		dist, time;
 	double		warpfact;
 	struct quad	*q;
 	struct event	*e;
 	if (check_out(COMPUTER))
 		return;
-	while (1)
+	while (1) {
 		r = getcodpar("\nRequest", Cputab);
-		switch ((long)r->value)
+		switch ((long)r->value) {
 		  case 1:			/* star chart */
 			printf("Computer record of galaxy for all long range sensor scans\n\n");
 			printf("  ");
 			/* print top header */
 			for (i = 0; i < NQUADS; i++)
 				printf("-%d- ", i);
 			printf("\n");
-			for (i = 0; i < NQUADS; i++)
+			for (i = 0; i < NQUADS; i++) {
 				printf("%d ", i);
-				for (j = 0; j < NQUADS; j++)
+				for (j = 0; j < NQUADS; j++) {
 					if (i == Ship.quadx && j == Ship.quady) {
 					if (i == Ship.quadx && j == Ship.quady)
 						printf("$$$ ");
 						continue;
+					}
 					q = &Quad[i][j];
 					/* 1000 or 1001 is special case */
 					if (q->scanned >= 1000)
 						if (q->scanned > 1000)
 							printf(".1. ");
 						else
 							printf("/// ");
 					else
 						if (q->scanned < 0)
 							printf("... ");
 						else
 							printf("%3d ", q->scanned);
+				}
 				printf("%d\n", i);
+			}
 			printf("  ");
 			/* print bottom footer */
 			for (i = 0; i < NQUADS; i++)
 				printf("-%d- ", i);
 			printf("\n");
 			break;
 		  case 2:			/* trajectory */
-			if (check_out(SRSCAN))
+			if (check_out(SRSCAN)) {
 				break;
+			}
-			if (Etc.nkling <= 0)
+			if (Etc.nkling <= 0) {
 				printf("No Klingons in this quadrant\n");
 				break;
+			}
 			/* for each Klingon, give the course & distance */
-			for (i = 0; i < Etc.nkling; i++)
+			for (i = 0; i < Etc.nkling; i++) {
 				printf("Klingon at %d,%d", Etc.klingon[i].x, Etc.klingon[i].y);
 				course = kalc(Ship.quadx, Ship.quady, Etc.klingon[i].x, Etc.klingon[i].y, &dist);
 				prkalc(course, dist);
+			}
 			break;
 		  case 3:			/* course calculation */
-			if (readdelim('/'))
+			if (readdelim('/')) {
 				tqx = Ship.quadx;
 				tqy = Ship.quady;
 			} else {
 			else
 				ix = getintpar("Quadrant");
 				if (ix < 0 || ix >= NSECTS)
 					break;
 				iy = getintpar("q-y");
 				if (iy < 0 || iy >= NSECTS)
 					break;
 				tqx = ix;
 				tqy = iy;
+			}
 			ix = getintpar("Sector");
 			if (ix < 0 || ix >= NSECTS)
 				break;
 			iy = getintpar("s-y");
 			if (iy < 0 || iy >= NSECTS)
 				break;
 			course = kalc(tqx, tqy, ix, iy, &dist);
-			if (r->value2)
+			if (r->value2) {
 				warp(-1, course, dist);
 				break;
+			}
 			printf("%d,%d/%d,%d to %d,%d/%d,%d",
 				Ship.quadx, Ship.quady, Ship.sectx, Ship.secty, tqx, tqy, ix, iy);
 			prkalc(course, dist);
 			break;
 		  case 4:			/* score */
 			score();
 			break;
 		  case 5:			/* phaser effectiveness */
 @@ -252,64 +239,62 @@ computer(int v __unused)
 			dist = getfltpar("distance");
 			if (dist < 0.0)
 				break;
 			cost = 20 + 100 * dist;
 			time = dist / 0.095;
 			printf("Distance %.2f cost %.2f stardates %d units\n",
 				dist, time, cost);
 			break;
 		  case 8:			/* distresslist */
 			j = 1;
 			printf("\n");
 			/* scan the event list */
-			for (i = 0; i < MAXEVENTS; i++)
+			for (i = 0; i < MAXEVENTS; i++) {
 				e = &Event[i];
 				/* ignore hidden entries */
 				if (e->evcode & E_HIDDEN)
 					continue;
-				switch (e->evcode & E_EVENT)
+				switch (e->evcode & E_EVENT) {
 				  case E_KDESB:
 					printf("Klingon is attacking starbase in quadrant %d,%d\n",
 						e->x, e->y);
 					j = 0;
 					break;
 				  case E_ENSLV:
 				  case E_REPRO:
 					printf("Starsystem %s in quadrant %d,%d is distressed\n",
 						Systemname[e->systemname], e->x, e->y);
 					j = 0;
 					break;
+				}
+			}
 			if (j)
 				printf("No known distress calls are active\n");
 			break;
+		}
-		/* skip to next semicolon or newline.  Semicolon
+		/*
 		 * Skip to next semicolon or newline.  Semicolon
 		 * means get new computer request; newline means
-		 * exit computer mode. */
+		 * exit computer mode.
-		while ((i = cgetc(0)) != ';')
+		 */
 		while ((i = cgetc(0)) != ';') {
 			if (i == '\0')
 				exit(1);
-			if (i == '\n')
+			if (i == '\n') {
 				ungetc(i, stdin);
 				return;
+			}
+		}
+	}
+}
 /*
 **  Course Calculation
 **
 **	Computes and outputs the course and distance from position
 **	sqx,sqy/ssx,ssy to tqx,tqy/tsx,tsy.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: phaser.c,v 1.12 2009/05/24 20:39:43 dholland Exp $	*/
+/*	$NetBSD: phaser.c,v 1.13 2009/05/24 21:44:56 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[] = "@(#)phaser.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: phaser.c,v 1.12 2009/05/24 20:39:43 dholland Exp $");
+__RCSID("$NetBSD: phaser.c,v 1.13 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <math.h>
 #include "trek.h"
 #include "getpar.h"
 /* factors for phaser hits; see description below */
 #define ALPHA		3.0		/* spread */
 #define BETA		3.0		/* franf() */
 #define GAMMA		0.30		/* cos(angle) */
 @@ -66,35 +66,33 @@ __RCSID("$NetBSD: phaser.c,v 1.12 2009/0
 **	The spread is specified as a number between zero and
 **	one, with zero being minimum spread and one being maximum
 **	spread.  You  will normally want zero spread, unless your
 **	short range scanners are out, in which case you probably
 **	don't know exactly where the Klingons are.  In that case,
 **	you really don't have any choice except to specify a
 **	fairly large spread.
 **
 **	Phasers spread slightly, even if you specify zero spread.
 **
 **	Uses trace flag 30
 */
-struct cvntab	Matab[] =
+struct cvntab	Matab[] = {
 	{ "m",		"anual",	(cmdfun) 1,	0 },
 	{ "a",		"utomatic",	(cmdfun) 0,	0 },
 	{ NULL,		NULL,		NULL,		0 }
 };
-struct banks
+struct banks {
 	int	units;
 	double	angle;
 	double	spread;
 };
 /*ARGSUSED*/
 void
 phaser(int v __unused)
+{
 	int		i;
 	int		j;
 @@ -112,218 +110,191 @@ phaser(int v __unused)
 	if (Ship.cond == DOCKED) {
 		printf("Phasers cannot fire through starbase shields\n");
 		return;
+	}
 	if (damaged(PHASER)) {
 		out(PHASER);
 		return;
+	}
 	if (Ship.shldup) {
 		printf("Sulu: Captain, we cannot fire through shields.\n");
 		return;
+	}
-	if (Ship.cloaked)
+	if (Ship.cloaked) {
 		printf("Sulu: Captain, surely you must realize that we cannot fire\n");
 		printf("  phasers with the cloaking device up.\n");
 		return;
+	}
 	/* decide if we want manual or automatic mode */
 	manual = 0;
-	if (testnl())
+	if (testnl()) {
 		if (damaged(COMPUTER)) {
 		if (damaged(COMPUTER))
 			printf("%s", Device[COMPUTER].name);
 			manual++;
 		} else if (damaged(SRSCAN)) {
 			printf("%s", Device[SRSCAN].name);
 			manual++;
+		}
 		else
 			if (damaged(SRSCAN))
 				printf("%s", Device[SRSCAN].name);
 				manual++;
 		if (manual)
 			printf(" damaged, manual mode selected\n");
+	}
-	if (!manual)
+	if (!manual) {
 		ptr = getcodpar("Manual or automatic", Matab);
 		manual = (long) ptr->value;
+	}
-	if (!manual && damaged(COMPUTER))
+	if (!manual && damaged(COMPUTER)) {
 		printf("Computer damaged, manual selected\n");
 		skiptonl(0);
 		manual++;
+	}
 	/* initialize the bank[] array */
 	flag = 1;
 	for (i = 0; i < NBANKS; i++)
 		bank[i].units = 0;
-	if (manual)
+	if (manual) {
 		/* collect manual mode statistics */
-		while (flag)
+		while (flag) {
 			printf("%d units available\n", Ship.energy);
 			extra = 0;
 			flag = 0;
-			for (i = 0; i < NBANKS; i++)
+			for (i = 0; i < NBANKS; i++) {
 				b = &bank[i];
 				printf("\nBank %d:\n", i);
 				hit = getintpar("units");
 				if (hit < 0)
 					return;
 				if (hit == 0)
 					break;
 				extra += hit;
-				if (extra > Ship.energy)
+				if (extra > Ship.energy) {
 					printf("available energy exceeded.  ");
 					skiptonl(0);
 					flag++;
 					break;
+				}
 				b->units = hit;
 				hit = getintpar("course");
 				if (hit < 0 || hit > 360)
 					return;
 				b->angle = hit * 0.0174532925;
 				b->spread = getfltpar("spread");
 				if (b->spread < 0 || b->spread > 1)
 					return;
+			}
 			Ship.energy -= extra;
+		}
 		extra = 0;
 	} else {
 	else
 		/* automatic distribution of power */
 		if (Etc.nkling <= 0) {
 			printf("Sulu: But there are no Klingons in this quadrant\n");
 			return;
+		}
 		printf("Phasers locked on target.  ");
-		while (flag)
+		while (flag) {
 			printf("%d units available\n", Ship.energy);
 			hit = getintpar("Units to fire");
 			if (hit <= 0)
 				return;
-			if (hit > Ship.energy)
+			if (hit > Ship.energy) {
 				printf("available energy exceeded.  ");
 				skiptonl(0);
 				continue;
+			}
 			flag = 0;
 			Ship.energy -= hit;
 			extra = hit;
 			n = Etc.nkling;
 			if (n > NBANKS)
 				n = NBANKS;
 			tot = n * (n + 1) / 2;
-			for (i = 0; i < n; i++)
+			for (i = 0; i < n; i++) {
 				k = &Etc.klingon[i];
 				b = &bank[i];
 				distfactor = k->dist;
 				anglefactor = ALPHA * BETA * OMEGA / (distfactor * distfactor + EPSILON);
 				anglefactor *= GAMMA;
 				distfactor = k->power;
 				distfactor /= anglefactor;
 				hitreqd[i] = distfactor + 0.5;
 				dx = Ship.sectx - k->x;
 				dy = k->y - Ship.secty;
 				b->angle = atan2(dy, dx);
 				b->spread = 0.0;
 				b->units = ((n - i) / tot) * extra;
 #ifdef xTRACE
-				if (Trace)
+				if (Trace) {
 					printf("b%d hr%d u%d df%.2f af%.2f\n",
 						i, hitreqd[i], b->units,
 						distfactor, anglefactor);
+				}
 #endif
 				extra -= b->units;
 				hit = b->units - hitreqd[i];
-				if (hit > 0)
+				if (hit > 0) {
 					extra += hit;
 					b->units -= hit;
+				}
+			}
 			/* give out any extra energy we might have around */
-			if (extra > 0)
+			if (extra > 0) {
 				for (i = 0; i < n; i++) {
 				for (i = 0; i < n; i++)
 					b = &bank[i];
 					hit = hitreqd[i] - b->units;
 					if (hit <= 0)
 						continue;
-					if (hit >= extra)
+					if (hit >= extra) {
 						b->units += extra;
 						extra = 0;
 						break;
+					}
 					b->units = hitreqd[i];
 					extra -= hit;
+				}
 				if (extra > 0)
 					printf("%d units overkill\n", extra);
+			}
+		}
+	}
 #ifdef xTRACE
-	if (Trace)
+	if (Trace) {
 		for (i = 0; i < NBANKS; i++) {
 		for (i = 0; i < NBANKS; i++)
 			b = &bank[i];
 			printf("b%d u%d", i, b->units);
 			if (b->units > 0)
 				printf(" a%.2f s%.2f\n", b->angle, b->spread);
 			else
 				printf("\n");
+		}
+	}
 #endif
 	/* actually fire the shots */
 	Move.free = 0;
-	for (i = 0; i < NBANKS; i++)
+	for (i = 0; i < NBANKS; i++) {
 		b = &bank[i];
-		if (b->units <= 0)
+		if (b->units <= 0) {
 			continue;
+		}
 		printf("\nPhaser bank %d fires:\n", i);
 		n = Etc.nkling;
 		k = Etc.klingon;
-		for (j = 0; j < n; j++)
+		for (j = 0; j < n; j++) {
 			if (b->units <= 0)
 				break;
 			/*
 			** The formula for hit is as follows:
 			**
 			**  zap = OMEGA * [(sigma + ALPHA) * (rho + BETA)]
 			**	/ (dist ** 2 + EPSILON)]
 			**	* [cos(delta * sigma) + GAMMA]
 			**	* hit
 			**
 			** where sigma is the spread factor,
 			** rho is a random number (0 -> 1),
 			** GAMMA is a crud factor for angle (essentially
 @@ -345,40 +316,38 @@ phaser(int v __unused)
 			** never greater than one, but the same restric-
 			** tion applies.
 			*/
 			distfactor = BETA + franf();
 			distfactor *= ALPHA + b->spread;
 			distfactor *= OMEGA;
 			anglefactor = k->dist;
 			distfactor /= anglefactor * anglefactor + EPSILON;
 			distfactor *= b->units;
 			dx = Ship.sectx - k->x;
 			dy = k->y - Ship.secty;
 			anglefactor = atan2(dy, dx) - b->angle;
 			anglefactor = cos((anglefactor * b->spread) + GAMMA);
-			if (anglefactor < 0.0)
+			if (anglefactor < 0.0) {
 				k++;
 				continue;
+			}
 			hit = anglefactor * distfactor + 0.5;
 			k->power -= hit;
 			printf("%d unit hit on Klingon", hit);
 			if (!damaged(SRSCAN))
 				printf(" at %d,%d", k->x, k->y);
 			printf("\n");
 			b->units -= hit;
-			if (k->power <= 0)
+			if (k->power <= 0) {
 				killk(k->x, k->y);
 				continue;
+			}
 			k++;
+		}
+	}
 	/* compute overkill */
 	for (i = 0; i < NBANKS; i++)
 		extra += bank[i].units;
 	if (extra > 0)
 		printf("\n%d units expended on empty space\n", extra);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dumpgame.c,v 1.13 2009/05/24 20:39:43 dholland Exp $	*/
+/*	$NetBSD: dumpgame.c,v 1.14 2009/05/24 21:44:56 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,50 +24,48 @@
  * 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[] = "@(#)dumpgame.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dumpgame.c,v 1.13 2009/05/24 20:39:43 dholland Exp $");
+__RCSID("$NetBSD: dumpgame.c,v 1.14 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <err.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include "trek.h"
 /***  THIS CONSTANT MUST CHANGE AS THE DATA SPACES CHANGE ***/
 #define VERSION		2
-struct dump
+struct dump {
 	char	*area;
 	int	count;
 };
 static int readdump(int);
-struct dump	Dump_template[] =
+struct dump Dump_template[] = {
 	{ (char *)&Ship,	sizeof (Ship) },
 	{ (char *)&Now,		sizeof (Now) },
 	{ (char *)&Param,	sizeof (Param) },
 	{ (char *)&Etc,		sizeof (Etc) },
 	{ (char *)&Game,	sizeof (Game) },
 	{ (char *)Sect,		sizeof (Sect) },
 	{ (char *)Quad,		sizeof (Quad) },
 	{ (char *)&Move,	sizeof (Move) },
 	{ (char *)Event,	sizeof (Event) },
 	{ NULL,			0 }
 };
 /*
 @@ -87,28 +85,27 @@ dumpgame(int v __unused)
 	int		version;
 	int		fd;
 	struct dump	*d;
 	int		i;
 	if ((fd = creat("trek.dump", 0644)) < 0) {
 		warn("cannot open `trek.dump'");
 		return;
+	}
 	version = VERSION;
 	write(fd, &version, sizeof version);
 	/* output the main data areas */
-	for (d = Dump_template; d->area; d++)
+	for (d = Dump_template; d->area; d++) {
 		write(fd, &d->area, sizeof d->area);
 		i = d->count;
 		write(fd, d->area, i);
+	}
 	close(fd);
+}
 /*
 **  RESTORE GAME
 **
 **	The game is restored from the file "trek.dump".  In order for
 @@ -118,28 +115,27 @@ dumpgame(int v __unused)
 **
 **	Return value is zero for success, one for failure.
 */
 int
 restartgame(void)
+{
 	int	fd;
 	int		version;
 	if ((fd = open("trek.dump", O_RDONLY)) < 0 ||
 	    read(fd, &version, sizeof version) != sizeof version ||
 	    version != VERSION ||
-	    readdump(fd))
+	    readdump(fd)) {
 		printf("cannot restart\n");
 		if (fd >= 0)
 			close(fd);
 		return (1);
+	}
 	close(fd);
 	return (0);
+}
 /*
 **  READ DUMP
 @@ -150,27 +146,26 @@ restartgame(void)
 **	Returns zero for success, one for failure.
 */
 static int
 readdump(int fd1)
+{
 	int		fd;
 	struct dump	*d;
 	int		i;
 	long			junk;
 	fd = fd1;
-	for (d = Dump_template; d->area; d++)
+	for (d = Dump_template; d->area; d++) {
 		if (read(fd, &junk, sizeof junk) != (sizeof junk))
 			return (1);
 		if ((char *)junk != d->area)
 			return (1);
 		i = d->count;
 		if (read(fd, d->area, i) != i)
 			return (1);
+	}
 	/* make quite certain we are at EOF */
 	return (read(fd, &junk, 1));
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: getpar.c,v 1.13 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: getpar.c,v 1.14 2009/05/24 21:44:56 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,92 +24,89 @@
  * 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.13 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: getpar.c,v 1.14 2009/05/24 21:44:56 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)
+	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)
+	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[] =
+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;
+}
 @@ -120,132 +117,125 @@ getynpar(const char *s)
  **/
 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)
+	while (1) {
 		flag |= (f = testnl());
 		if (flag)
 			printf("%s: ", s);
-		if (f)
+		if (f) {
-			cgetc(0);		/* throw out the newline */
+			/* throw out the newline */
 			cgetc(0);
+		}
 		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)
+		if (input[0] == '?' && input[1] == 0) {
 			c = 4;
-			for (r = tab; r->abrev; r++)
+			for (r = tab; r->abrev; r++) {
 				strcpy(input, r->abrev);
 				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->abrev; r++) {
 			p = input;
 			for (q = r->abrev; *q; q++)
 				if (*p++ != *q)
 					break;
-			if (!*q)
+			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->abrev) {
 			printf("invalid input; ? for valid inputs\n");
 			skiptonl(0);
 		} else
 		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)
+	while (1) {
 		if ((f = testnl()) && s)
 			printf("%s: ", s);
 		if (f)
 			cgetc(0);
 		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)
+{
 	char		c;
 	while ((c = cgetc(0)) != '\n')
 		if ((c >= '0' && c <= '9') || c == '.' || c == '!' ||
-				(c >= 'A' && c <= 'Z') ||
+		    (c >= 'A' && c <= 'Z') ||
-				(c >= 'a' && c <= 'z') || c == '-')
+		    (c >= 'a' && c <= 'z') || c == '-') {
 			ungetc(c, stdin);
 			return(0);
+		}
 	ungetc(c, stdin);
 	return (1);
+}
 /**
  **	scan for newline
  **/
 void
 @@ -281,24 +271,23 @@ testterm(void)
 /*
 **  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)
+{
 	char	c;
-	while ((c = cgetc(0)) != '\0')
+	while ((c = cgetc(0)) != '\0') {
 		if (c == d)
 			return (1);
 		if (c == ' ')
 			continue;
 		ungetc(c, stdin);
 		break;
+	}
 	return (0);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: trek.h,v 1.13 2009/05/24 20:39:43 dholland Exp $	*/
+/*	$NetBSD: trek.h,v 1.14 2009/05/24 21:44:56 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.
 @@ -42,52 +42,53 @@
 **	So far as I know, nothing in here must be preinitialized to
 **	zero.
 */
 /* external function definitions */
 /*********************  GALAXY  **************************/
 /* galactic parameters */
 #define NSECTS		10	/* dimensions of quadrant in sectors */
 #define NQUADS		8	/* dimension of galazy in quadrants */
 #define NINHAB		32	/* number of quadrants which are inhabited */
-struct quad		/* definition for each quadrant */
+/* definition for each quadrant */
 struct quad {
 	unsigned char	bases;	/* number of bases in this quadrant */
 	char	klings;		/* number of Klingons in this quadrant */
 	char	holes;		/* number of black holes in this quadrant */
 	int	scanned;	/* star chart entry (see below) */
 	short	stars;		/* number of stars in this quadrant */
 	char	qsystemname;	/* starsystem name (see below) */
 };
 #define Q_DISTRESSED	0200
 #define Q_SYSTEM	077
-/*  systemname conventions:
+/*
  *  systemname conventions:
  *	1 -> NINHAB	index into Systemname table for live system.
  *	+ Q_DISTRESSED	distressed starsystem -- systemname & Q_SYSTEM
  *			is the index into the Event table which will
  *			have the system name
  *	0		dead or nonexistent starsystem
+ *
  *  starchart ("scanned") conventions:
  *	0 -> 999	taken as is
  *	-1		not yet scanned ("...")
  *	1000		supernova ("///")
  *	1001		starbase + ??? (".1.")
-*/
+ */
 /* ascii names of systems */
 extern const char	*const Systemname[NINHAB];
 /* quadrant definition */
 extern struct quad	Quad[NQUADS][NQUADS];
 /* defines for sector map  (below) */
 #define EMPTY		'.'
 #define STAR		'*'
 #define BASE		'#'
 #define ENTERPRISE	'E'
 #define QUEENE		'Q'
 @@ -111,180 +112,176 @@ extern char	Sect[NSECTS][NSECTS];
 #define PHASER		3	/* phaser control */
 #define TORPED		4	/* photon torpedo control */
 #define IMPULSE		5	/* impulse engines */
 #define SHIELD		6	/* shield control */
 #define COMPUTER	7	/* on board computer */
 #define SSRADIO		8	/* subspace radio */
 #define LIFESUP		9	/* life support systems */
 #define SINS		10	/* Space Inertial Navigation System */
 #define CLOAK		11	/* cloaking device */
 #define XPORTER		12	/* transporter */
 #define SHUTTLE		13	/* shuttlecraft */
 /* device names */
-struct device
+struct device {
 	const char	*name;		/* device name */
 	const char	*person;	/* the person who fixes it */
 };
 extern const struct device	Device[NDEV];
 /***************************  EVENTS  ****************************/
 #define	NEVENTS		12	/* number of different event types */
 #define E_LRTB		1	/* long range tractor beam */
 #define E_KATSB		2	/* Klingon attacks starbase */
 #define E_KDESB		3	/* Klingon destroys starbase */
 #define E_ISSUE		4	/* distress call is issued */
 #define E_ENSLV		5	/* Klingons enslave a quadrant */
 #define E_REPRO		6	/* a Klingon is reproduced */
 #define E_FIXDV		7	/* fix a device */
 #define E_ATTACK	8	/* Klingon attack during rest period */
 #define E_SNAP		9	/* take a snapshot for time warp */
 #define E_SNOVA		10	/* supernova occurs */
 #define E_GHOST		0100	/* ghost of a distress call if ssradio out */
 #define E_HIDDEN	0200	/* event unreportable because ssradio out */
 #define E_EVENT		077	/* mask to get event code */
-struct event
+struct event {
 	unsigned char 	x, y;		/* coordinates */
 	double		date;		/* trap stardate */
 	char		evcode;		/* event type */
 	unsigned char	systemname;	/* starsystem name */
 };
 /* systemname conventions:
 /*
  * systemname conventions:
  *	1 -> NINHAB	index into Systemname table for reported distress calls
+ *
  * evcode conventions:
  *	1 -> NEVENTS-1	event type
  *	+ E_HIDDEN	unreported (SSradio out)
  *	+ E_GHOST	actually already expired
  *	0		unallocated
  */
-#define MAXEVENTS	25	/* max number of concurrently pending events */
+/* max number of concurrently pending events */
 #define MAXEVENTS	25
-extern struct event	Event[MAXEVENTS];	/* dynamic event list; one entry per pending event */
+/* dynamic event list; one entry per pending event */
 extern struct event	Event[MAXEVENTS];
 /*****************************  KLINGONS  *******************************/
-struct kling
+struct kling {
 	unsigned char	x, y;	/* coordinates */
 	int	power;		/* power left */
 	double	dist;		/* distance to Enterprise */
 	double	avgdist;	/* average over this move */
 	char	srndreq;	/* set if surrender has been requested */
 };
 #define MAXKLQUAD	9	/* maximum klingons per quadrant */
 /********************** MISCELLANEOUS ***************************/
 /* condition codes */
 #define GREEN		0
 #define DOCKED		1
 #define YELLOW		2
 #define RED		3
 /* starbase coordinates */
 #define MAXBASES	9	/* maximum number of starbases in galaxy */
 /*  distress calls  */
 #define MAXDISTR	5	/* maximum concurrent distress calls */
 /* phaser banks */
 #define NBANKS		6	/* number of phaser banks */
-struct xy
+struct xy {
 	unsigned char	x, y;		/* coordinates */
 };
 /*
  *	note that much of the stuff in the following structs CAN NOT
  *	be moved around!!!!
  */
 /* information regarding the state of the starship */
-struct Ship_struct
+struct Ship_struct {
 	double	warp;		/* warp factor */
 	double	warp2;		/* warp factor squared */
 	double	warp3;		/* warp factor cubed */
 	char	shldup;		/* shield up flag */
 	char	cloaked;	/* set if cloaking device on */
 	int	energy;		/* starship's energy */
 	int	shield;		/* energy in shields */
 	double	reserves;	/* life support reserves */
 	int	crew;		/* ship's complement */
 	int	brigfree;	/* space left in brig */
 	char	torped;		/* torpedoes */
 	char	cloakgood;	/* set if we have moved */
 	int	quadx;		/* quadrant x coord */
 	int	quady;		/* quadrant y coord */
 	int	sectx;		/* sector x coord */
 	int	secty;		/* sector y coord */
 	unsigned char	cond;	/* condition code */
 	/* sinsbad is set if SINS is working but not calibrated */
 	char	sinsbad;	/* Space Inertial Navigation System condition */
 	const char *shipname;	/* name of current starship */
 	char	ship;		/* current starship */
 	int	distressed;	/* number of distress calls */
 };
 extern struct Ship_struct Ship;
 /* sinsbad is set if SINS is working but not calibrated */
 /* game related information, mostly scoring */
-struct Game_struct
+struct Game_struct {
 	int	killk;		/* number of klingons killed */
 	int	deaths;		/* number of deaths onboard Enterprise */
 	char	negenbar;	/* number of hits on negative energy barrier */
 	char	killb;		/* number of starbases killed */
 	int	kills;		/* number of stars killed */
 	char	skill;		/* skill rating of player */
 	char	length;		/* length of game */
 	char	killed;		/* set if you were killed */
 	char	killinhab;	/* number of inhabited starsystems killed */
 	char	tourn;		/* set if a tournament game */
 	char	passwd[15];	/* game password */
 	char	snap;		/* set if snapshot taken */
 	char	helps;		/* number of help calls */
 	int	captives;	/* total number of captives taken */
 };
 extern struct Game_struct Game;
 /* per move information */
-struct Move_struct
+struct Move_struct {
 	char	free;		/* set if a move is free */
 	char	endgame;	/* end of game flag */
 	char	shldchg;	/* set if shields changed this move */
 	char	newquad;	/* set if just entered this quadrant */
 	char	resting;	/* set if this move is a rest */
 	double	time;		/* time used this move */
 };
 extern struct Move_struct Move;
 /* parametric information */
-struct Param_struct
+struct Param_struct {
 	unsigned char	bases;	/* number of starbases */
 	char	klings;		/* number of klingons */
 	double	date;		/* stardate */
 	double	time;		/* time left */
 	double	resource;	/* Federation resources */
 	int	energy;		/* starship's energy */
 	int	shield;		/* energy in shields */
 	double	reserves;	/* life support reserves */
 	int	crew;		/* size of ship's complement */
 	int	brigfree;	/* max possible number of captives */
 	char	torped;		/* photon torpedos */
 	double	damfac[NDEV];	/* damage factor */
 	double	dockfac;	/* docked repair time factor */
 @@ -300,42 +297,40 @@ struct Param_struct
 	double	navigcrud[2];	/* navigation crudup factor */
 	int	cloakenergy;	/* cloaking device energy per stardate */
 	double	damprob[NDEV];	/* damage probability */
 	double	hitfac;		/* Klingon attack factor */
 	int	klingcrew;	/* number of Klingons in a crew */
 	double	srndrprob;	/* surrender probability */
 	int	energylow;	/* low energy mark (cond YELLOW) */
 };
 extern struct Param_struct Param;
 /* Sum of damage probabilities must add to 1000 */
 /* other information kept in a snapshot */
-struct Now_struct
+struct Now_struct {
 	unsigned char	bases;	/* number of starbases */
 	char	klings;		/* number of klingons */
 	double	date;		/* stardate */
 	double	time;		/* time left */
 	double	resource;	/* Federation resources */
 	char	distressed;	/* number of currently distressed quadrants */
 	struct event	*eventptr[NEVENTS];	/* pointer to event structs */
 	struct xy	base[MAXBASES];		/* locations of starbases */
 };
 extern struct Now_struct Now;
 /* Other stuff, not dumped in a snapshot */
-struct Etc_struct
+struct Etc_struct {
 	struct kling	klingon[MAXKLQUAD];	/* sorted Klingon list */
 	short		nkling;			/* number of Klingons in this sector */
 						/* < 0 means automatic override mode */
 	char		fast;			/* set if speed > 300 baud */
 	struct xy	starbase;	/* starbase in current quadrant */
 	char		snapshot[sizeof Quad + sizeof Event + sizeof Now];	/* snapshot for time warp */
 	char		statreport;		/* set to get a status report on a srscan */
 };
 extern struct Etc_struct Etc;
 /*
  *	eventptr is a pointer to the event[] entry of the last
  *	scheduled event of each type.  Zero if no such event scheduled.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: help.c,v 1.10 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: help.c,v 1.11 2009/05/24 21:44:56 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[] = "@(#)help.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: help.c,v 1.10 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: help.c,v 1.11 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <math.h>
 #include <unistd.h>
 #include <limits.h>
 #include "trek.h"
 /*
 **  call starbase for help
 **
 **	First, the closest starbase is selected.  If there is a
 @@ -54,28 +54,29 @@ __RCSID("$NetBSD: help.c,v 1.10 2009/05/
 **	A magic number is computed based on the distance which acts
 **	as the probability that you will be rematerialized.  You
 **	get three tries.
 **
 **	When it is determined that you should be able to be remater-
 **	ialized (i.e., when the probability thing mentioned above
 **	comes up positive), you are put into that quadrant (anywhere).
 **	Then, we try to see if there is a spot adjacent to the star-
 **	base.  If not, you can't be rematerialized!!!  Otherwise,
 **	it drops you there.  It only tries five times to find a spot
 **	to drop you.  After that, it's your problem.
 */
-const char	*const Cntvect[3] =
+const char *const Cntvect[3] = {
-{"first", "second", "third"};
+	"first", "second", "third"
 };
 /*ARGSUSED*/
 void
 help(int v __unused)
+{
 	int		i;
 	double		dist, x;
 	int		dx = 0, dy = 0;
 	int		j, l = 0;
 	/* check to see if calling for help is reasonable ... */
 	if (Ship.cond == DOCKED) {
 		printf("Uhura: But Captain, we're already docked\n");
 @@ -87,82 +88,73 @@ help(int v __unused)
 		out(SSRADIO);
 		return;
+	}
 	if (Now.bases <= 0) {
 		printf("Uhura: I'm not getting any response from starbase\n");
 		return;
+	}
 	/* tut tut, there goes the score */
 	Game.helps += 1;
 	/* find the closest base */
 	dist = TOOLARGE;
-	if (Quad[Ship.quadx][Ship.quady].bases <= 0)
+	if (Quad[Ship.quadx][Ship.quady].bases <= 0) {
 		/* there isn't one in this quadrant */
-		for (i = 0; i < Now.bases; i++)
+		for (i = 0; i < Now.bases; i++) {
 			/* compute distance */
 			dx = Now.base[i].x - Ship.quadx;
 			dy = Now.base[i].y - Ship.quady;
 			x = dx * dx + dy * dy;
 			x = sqrt(x);
 			/* see if better than what we already have */
-			if (x < dist)
+			if (x < dist) {
 				dist = x;
 				l = i;
+			}
+		}
 		/* go to that quadrant */
 		Ship.quadx = Now.base[l].x;
 		Ship.quady = Now.base[l].y;
 		initquad(1);
 	} else {
 	else
 		dist = 0.0;
+	}
 	/* dematerialize the Enterprise */
 	Sect[Ship.sectx][Ship.secty] = EMPTY;
 	printf("Starbase in %d,%d responds\n", Ship.quadx, Ship.quady);
 	/* this next thing acts as a probability that it will work */
 	x = pow(1.0 - pow(0.94, dist), 0.3333333);
 	/* attempt to rematerialize */
-	for (i = 0; i < 3; i++)
+	for (i = 0; i < 3; i++) {
 		sleep(2);
 		printf("%s attempt to rematerialize ", Cntvect[i]);
-		if (franf() > x)
+		if (franf() > x) {
 			/* ok, that's good.  let's see if we can set her down */
-			for (j = 0; j < 5; j++)
+			for (j = 0; j < 5; j++) {
 				dx = Etc.starbase.x + ranf(3) - 1;
 				if (dx < 0 || dx >= NSECTS)
 					continue;
 				dy = Etc.starbase.y + ranf(3) - 1;
 				if (dy < 0 || dy >= NSECTS || Sect[dx][dy] != EMPTY)
 					continue;
 				break;
+			}
-			if (j < 5)
+			if (j < 5) {
 				/* found an empty spot */
 				printf("succeeds\n");
 				Ship.sectx = dx;
 				Ship.secty = dy;
 				Sect[dx][dy] = Ship.ship;
 				dock(0);
 				compkldist(0);
 				return;
+			}
 			/* the starbase must have been surrounded */
+		}
 		printf("fails\n");
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: play.c,v 1.10 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: play.c,v 1.11 2009/05/24 21:44:56 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,50 +24,49 @@
  * 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[] = "@(#)play.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: play.c,v 1.10 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: play.c,v 1.11 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <setjmp.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  INSTRUCTION READ AND MAIN PLAY LOOP
 **
 **	Well folks, this is it.  Here we have the guts of the game.
 **	This routine executes moves.  It sets up per-move variables,
 **	gets the command, and executes the command.  After the command,
 **	it calls events() to use up time, attack() to have Klingons
 **	attack if the move was not free, and checkcond() to check up
 **	on how we are doing after the move.
 */
 extern jmp_buf env;
-const struct cvntab	Comtab[] =
+const struct cvntab	Comtab[] = {
 	{ "abandon",		"",		abandon,	0 },
 	{ "ca",			"pture",	capture,	0 },
 	{ "cl",			"oak",		shield,		-1 },
 	{ "c",			"omputer",	computer,	0 },
 	{ "da",			"mages",	dcrept,		0 },
 	{ "destruct",		"",		destruct,	0 },
 	{ "do",			"ck",		dock,		0 },
 	{ "help",		"",		help,		0 },
 	{ "i",			"mpulse",	impulse,	0 },
 	{ "l",			"rscan",	lrscan,		0 },
 	{ "m",			"ove",		dowarp,		0 },
 	{ "p",			"hasers",	phaser,		0 },
 	{ "ram",		"",		dowarp,		1 },
 @@ -87,28 +86,27 @@ const struct cvntab	Comtab[] =
 /*ARGSUSED*/
 void
 myreset(int v __unused)
+{
 	longjmp(env, 1);
+}
 void
 play(void)
+{
 	const struct cvntab		*r;
-	while (1)
+	while (1) {
 		Move.free = 1;
 		Move.time = 0.0;
 		Move.shldchg = 0;
 		Move.newquad = 0;
 		Move.resting = 0;
 		skiptonl(0);
 		r = getcodpar("\nCommand", Comtab);
 		(*r->value)(r->value2);
 		events(0);
 		attack(0);
 		checkcond();
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.15 2009/05/24 20:39:43 dholland Exp $	*/
+/*	$NetBSD: main.c,v 1.16 2009/05/24 21:44:56 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.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.15 2009/05/24 20:39:43 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.16 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <setjmp.h>
 #include <termios.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <err.h>
 #include <time.h>
 #include <sys/types.h>
 #include "trek.h"
 #include "getpar.h"
 @@ -172,36 +172,33 @@ main(int argc, char **argv)
 	/* Revoke setgid privileges */
 	setgid(getgid());
 	av = argv;
 	ac = argc;
 	av++;
 	time(&curtime);
 	vect = (long) curtime;
 	srand(vect);
 	opencode = 'w';
 	prio = PRIO;
-	if (tcgetattr(1, &argp) == 0)
+	if (tcgetattr(1, &argp) == 0) {
 		if (cfgetispeed(&argp) < B1200)
 			Etc.fast++;
+	}
-	while (ac > 1 && av[0][0] == '-')
+	while (ac > 1 && av[0][0] == '-') {
 		switch (av[0][1]) {
 		switch (av[0][1])
 		  case 'a':	/* append to log file */
 			opencode = 'a';
 			break;
 		  case 'f':	/* set fast mode */
 			Etc.fast++;
 			break;
 		  case 's':	/* set slow mode */
 			Etc.fast = 0;
 			break;
 #ifdef xTRACE
 @@ -218,34 +215,33 @@ main(int argc, char **argv)
 			prio = atoi(av[0] + 2);
 			break;
 		  default:
 		  badflag:
 			printf("Invalid option: %s\n", av[0]);
+		}
 		ac--;
 		av++;
+	}
 	if (ac > 2)
 		errx(1, "arg count");
-		/*
+	/*
 	if (ac > 1)
 		f_log = fopen(av[0], opencode);
-		*/
+	*/
 	printf("\n   * * *   S T A R   T R E K   * * *\n\nPress return to continue.\n");
-	if (setjmp(env))
+	if (setjmp(env)) {
 		if ( !getynpar("Another game") )
 			exit(0);
+	}
 	do
 	do {
 		setup();
 		play();
 	} while (getynpar("Another game"));
 	fflush(stdout);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: setup.c,v 1.11 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: setup.c,v 1.12 2009/05/24 21:44:56 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,101 +24,96 @@
  * 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[] = "@(#)setup.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: setup.c,v 1.11 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: setup.c,v 1.12 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <err.h>
 #include <limits.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  INITIALIZE THE GAME
 **
 **	The length, skill, and password are read, and the game
 **	is initialized.  It is far too difficult to describe all
 **	that goes on in here, but it is all straight-line code;
 **	give it a look.
 **
 **	Game restart and tournament games are handled here.
 */
-const struct cvntab	Lentab[] =
+const struct cvntab	Lentab[] = {
 	{ "s",		"hort",		(cmdfun)1,	0 },
 	{ "m",		"edium",	(cmdfun)2,	0 },
 	{ "l",		"ong",		(cmdfun)4,	0 },
 	{ "restart",	"",		(cmdfun)0,	0 },
 	{ NULL,		NULL,		NULL,		0 }
 };
-const struct cvntab	Skitab[] =
+const struct cvntab	Skitab[] = {
 	{ "n",		"ovice",	(cmdfun)1,	0 },
 	{ "f",		"air",		(cmdfun)2,	0 },
 	{ "g",		"ood",		(cmdfun)3,	0 },
 	{ "e",		"xpert",	(cmdfun)4,	0 },
 	{ "c",		"ommodore",	(cmdfun)5,	0 },
 	{ "i",		"mpossible",	(cmdfun)6,	0 },
 	{ NULL,		NULL,		NULL,		0 }
 };
 void
 setup(void)
+{
 	const struct cvntab		*r;
 	int		i, j;
 	double			f;
 	int			d;
 	int			klump;
 	int			ix, iy;
 	struct quad	*q;
 	struct event		*e;
-	while (1)
+	while (1) {
 		r = getcodpar("What length game", Lentab);
 		Game.length = (long) r->value;
-		if (Game.length == 0)
+		if (Game.length == 0) {
 			if (restartgame())
 				continue;
 			return;
+		}
 		break;
+	}
 	r = getcodpar("What skill game", Skitab);
 	Game.skill = (long) r->value;
 	Game.tourn = 0;
 	getstrpar("Enter a password", Game.passwd, 14, 0);
-	if (strcmp(Game.passwd, "tournament") == 0)
+	if (strcmp(Game.passwd, "tournament") == 0) {
 		getstrpar("Enter tournament code", Game.passwd, 14, 0);
 		Game.tourn = 1;
 		d = 0;
 		for (i = 0; Game.passwd[i]; i++)
 			d += Game.passwd[i] << i;
 		srand(d);
+	}
 	Param.bases = Now.bases = ranf(6 - Game.skill) + 2;
 	if (Game.skill == 6)
 		Param.bases = Now.bases = 1;
 	Param.time = Now.time = 6.0 * Game.length + 2.0;
 	i = Game.skill;
 	j = Game.length;
 @@ -199,107 +194,99 @@ setup(void)
 	Param.movefac[KM_LA] = 0.25;
 	Param.eventdly[E_SNOVA] = 0.5;
 	Param.eventdly[E_LRTB] = 25.0;
 	Param.eventdly[E_KATSB] = 1.0;
 	Param.eventdly[E_KDESB] = 3.0;
 	Param.eventdly[E_ISSUE] = 1.0;
 	Param.eventdly[E_SNAP] = 0.5;
 	Param.eventdly[E_ENSLV] = 0.5;
 	Param.eventdly[E_REPRO] = 2.0;
 	Param.navigcrud[0] = 1.50;
 	Param.navigcrud[1] = 0.75;
 	Param.cloakenergy = 1000;
 	Param.energylow = 1000;
-	for (i = 0; i < MAXEVENTS; i++)
+	for (i = 0; i < MAXEVENTS; i++) {
 		e = &Event[i];
 		e->date = TOOLARGE;
 		e->evcode = 0;
+	}
 	xsched(E_SNOVA, 1, 0, 0, 0);
 	xsched(E_LRTB, Param.klings, 0, 0, 0);
 	xsched(E_KATSB, 1, 0, 0, 0);
 	xsched(E_ISSUE, 1, 0, 0, 0);
 	xsched(E_SNAP, 1, 0, 0, 0);
 	Ship.sectx = ranf(NSECTS);
 	Ship.secty = ranf(NSECTS);
 	Game.killk = Game.kills = Game.killb = 0;
 	Game.deaths = Game.negenbar = 0;
 	Game.captives = 0;
 	Game.killinhab = 0;
 	Game.helps = 0;
 	Game.killed = 0;
 	Game.snap = 0;
 	Move.endgame = 0;
 	/* setup stars */
-	for (i = 0; i < NQUADS; i++)
+	for (i = 0; i < NQUADS; i++) {
-		for (j = 0; j < NQUADS; j++)
+		for (j = 0; j < NQUADS; j++) {
 			short s5;
 			q = &Quad[i][j];
 			q->klings = q->bases = 0;
 			q->scanned = -1;
 			q->stars = ranf(9) + 1;
 			q->holes = ranf(3);
 			s5 = q->stars / 5;
 			q->holes = q->holes > s5 ? q->holes - s5 : 0;
 			q->qsystemname = 0;
+		}
+	}
 	/* select inhabited starsystems */
-	for (d = 1; d < NINHAB; d++)
+	for (d = 1; d < NINHAB; d++) {
 		do {
 		do
 			i = ranf(NQUADS);
 			j = ranf(NQUADS);
 			q = &Quad[i][j];
 		} while (q->qsystemname);
 		q->qsystemname = d;
+	}
 	/* position starbases */
-	for (i = 0; i < Param.bases; i++)
+	for (i = 0; i < Param.bases; i++) {
 		while (1) {
 		while (1)
 			ix = ranf(NQUADS);
 			iy = ranf(NQUADS);
 			q = &Quad[ix][iy];
 			if (q->bases > 0)
 				continue;
 			break;
+		}
 		q->bases = 1;
 		Now.base[i].x = ix;
 		Now.base[i].y = iy;
 		q->scanned = 1001;
 		/* start the Enterprise near starbase */
-		if (i == 0)
+		if (i == 0) {
 			Ship.quadx = ix;
 			Ship.quady = iy;
+		}
+	}
 	/* position klingons */
-	for (i = Param.klings; i > 0; )
+	for (i = Param.klings; i > 0; ) {
 		klump = ranf(4) + 1;
 		if (klump > i)
 			klump = i;
-		while (1)
+		while (1) {
 			ix = ranf(NQUADS);
 			iy = ranf(NQUADS);
 			q = &Quad[ix][iy];
 			if (q->klings + klump > MAXKLQUAD)
 				continue;
 			q->klings += klump;
 			i -= klump;
 			break;
+		}
+	}
 	/* initialize this quadrant */
 	printf("%d Klingons\n%d starbase", Param.klings, Param.bases);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: torped.c,v 1.11 2009/05/24 20:43:09 dholland Exp $	*/
+/*	$NetBSD: torped.c,v 1.12 2009/05/24 21:44:56 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[] = "@(#)torped.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: torped.c,v 1.11 2009/05/24 20:43:09 dholland Exp $");
+__RCSID("$NetBSD: torped.c,v 1.12 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include "trek.h"
 #include "getpar.h"
 /*
 **  PHOTON TORPEDO CONTROL
 **
 **	Either one or three photon torpedoes are fired.  If three
 @@ -69,130 +69,116 @@ static int randcourse(int);
 void
 torped(int v __unused)
+{
 	int		ix, iy;
 	double		x, y, dx, dy;
 	double		angle;
 	int		course, course2;
 	int		k;
 	double		bigger;
 	double		sectsize;
 	int		burst;
 	int		n;
-	if (Ship.cloaked)
+	if (Ship.cloaked) {
 		printf("Federation regulations do not permit attack while cloaked.\n");
 		return;
+	}
 	if (check_out(TORPED))
 		return;
-	if (Ship.torped <= 0)
+	if (Ship.torped <= 0) {
 		printf("All photon torpedos expended\n");
 		return;
+	}
 	/* get the course */
 	course = getintpar("Torpedo course");
 	if (course < 0 || course > 360)
 		return;
 	burst = -1;
 	/* need at least three torpedoes for a burst */
-	if (Ship.torped < 3)
+	if (Ship.torped < 3) {
 		printf("No-burst mode selected\n");
 		burst = 0;
 	} else {
 	else
 		/* see if the user wants one */
-		if (!testnl())
+		if (!testnl()) {
 			k = ungetc(cgetc(0), stdin);
 			if (k >= '0' && k <= '9')
 				burst = 1;
+		}
+	}
-	if (burst < 0)
+	if (burst < 0) {
 		burst = getynpar("Do you want a burst");
+	}
-	if (burst)
+	if (burst) {
 		burst = getintpar("burst angle");
 		if (burst <= 0)
 			return;
 		if (burst > 15) {
 			printf("Maximum burst angle is 15 degrees\n");
 			return;
+		}
+	}
 	sectsize = NSECTS;
 	n = -1;
-	if (burst)
+	if (burst) {
 		n = 1;
 		course -= burst;
+	}
-	for (; n && n <= 3; n++)
+	for (; n && n <= 3; n++) {
 		/* select a nice random course */
 		course2 = course + randcourse(n);
-		angle = course2 * 0.0174532925;			/* convert to radians */
+		/* convert to radians */
 		angle = course2 * 0.0174532925;
 		dx = -cos(angle);
 		dy =  sin(angle);
 		bigger = fabs(dx);
 		x = fabs(dy);
 		if (x > bigger)
 			bigger = x;
 		dx /= bigger;
 		dy /= bigger;
 		x = Ship.sectx + 0.5;
 		y = Ship.secty + 0.5;
 		if (Ship.cond != DOCKED)
 			Ship.torped -= 1;
 		printf("Torpedo track");
 		if (n > 0)
 			printf(", torpedo number %d", n);
 		printf(":\n%6.1f\t%4.1f\n", x, y);
-		while (1)
+		while (1) {
 			ix = x += dx;
 			iy = y += dy;
-			if (x < 0.0 || x >= sectsize || y < 0.0 || y >= sectsize)
+			if (x < 0.0 || x >= sectsize || y < 0.0 || y >= sectsize) {
 				printf("Torpedo missed\n");
 				break;
+			}
 			printf("%6.1f\t%4.1f\n", x, y);
-			switch (Sect[ix][iy])
+			switch (Sect[ix][iy]) {
 			  case EMPTY:
 				continue;
 			  case HOLE:
 				printf("Torpedo disappears into a black hole\n");
 				break;
 			  case KLINGON:
-				for (k = 0; k < Etc.nkling; k++)
+				for (k = 0; k < Etc.nkling; k++) {
 					if (Etc.klingon[k].x != ix || Etc.klingon[k].y != iy)
 						continue;
 					Etc.klingon[k].power -= 500 + ranf(501);
-					if (Etc.klingon[k].power > 0)
+					if (Etc.klingon[k].power > 0) {
 						printf("*** Hit on Klingon at %d,%d: extensive damages\n",
 							ix, iy);
 						break;
+					}
 					killk(ix, iy);
 					break;
+				}
 				break;
 			  case STAR:
 				nova(ix, iy);
 				break;
 @@ -226,36 +212,33 @@ torped(int v __unused)
 **
 **	This routine randomizes the course for torpedo number 'n'.
 **	Other things handled by this routine are misfires, damages
 **	to the tubes, etc.
 */
 static int
 randcourse(int n)
+{
 	double			r;
 	int		d;
 	d = ((franf() + franf()) - 1.0) * 20;
-	if (abs(d) > 12)
+	if (abs(d) > 12) {
 		printf("Photon tubes misfire");
 		if (n < 0)
 			printf("\n");
 		else
 			printf(" on torpedo %d\n", n);
-		if (ranf(2))
+		if (ranf(2)) {
 			damage(TORPED, 0.2 * abs(d) * (franf() + 1.0));
+		}
 		d *= 1.0 + 2.0 * franf();
+	}
-	if (Ship.shldup || Ship.cond == DOCKED)
+	if (Ship.shldup || Ship.cond == DOCKED) {
 		r = Ship.shield;
 		r = 1.0 + r / Param.shield;
 		if (Ship.cond == DOCKED)
 			r = 2.0;
 		d *= r;
+	}
 	return (d);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: getpar.h,v 1.10 2005/02/15 12:54:50 jsm Exp $	*/
+/*	$NetBSD: getpar.h,v 1.11 2009/05/24 21:44:56 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.
 @@ -22,28 +22,29 @@
  * 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);
 struct cvntab		/* used for getcodpar() parameter list */
 /* used for getcodpar() parameter list */
 struct cvntab {
 	const char	*abrev;
 	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[]);