Increase spending on vowels. No object file diffs.

[bsdgames-darwin.git] / trek / initquad.c

diff --git a/trek/initquad.c b/trek/initquad.c
index b644a7f5bed626acfef531479f824126e5e5e50a..0e8dbdc37c829d1f951b9473810c58dca1fa0211 100644 (file)
--- a/trek/initquad.c
+++ b/trek/initquad.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: initquad.c,v 1.7 2009/05/24 21:44:56 dholland Exp $    */
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,11 +29,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)initquad.c 5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)initquad.c 8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: initquad.c,v 1.7 2009/05/24 21:44:56 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include "trek.h"
 
 /*
 **  Paramize Quadrant Upon Entering
@@ -54,14 +58,14 @@ static char sccsid[] = "@(#)initquad.c      5.4 (Berkeley) 6/1/90";
 **     to be docked, i.e., abandon() and help().
 */
 
-initquad(f)
-int    f;
+void
+initquad(int f)
 {
-       register int            i, j;
-       int                     rx, ry;
-       int                     nbases, nstars;
-       register struct quad    *q;
-       int                     nholes;
+       int             i, j;
+       int             rx, ry;
+       int             nbases, nstars;
+       struct quad     *q;
+       int             nholes;
 
        q = &Quad[Ship.quadx][Ship.quady];
 
@@ -74,8 +78,7 @@ int   f;
        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))
@@ -91,8 +94,7 @@ int   f;
        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;
@@ -103,8 +105,7 @@ int f;
        compkldist(1);
 
        /* initialize star base */
-       if (nbases > 0)
-       {
+       if (nbases > 0) {
                sector(&rx, &ry);
                Sect[rx][ry] = BASE;
                Etc.starbase.x = rx;
@@ -112,23 +113,20 @@ int       f;
        }
 
        /* 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;
        }
@@ -136,13 +134,12 @@ int       f;
 }
 
 
-sector(x, y)
-int    *x, *y;
+void
+sector(int *x, int *y)
 {
-       register int            i, j;
+       int     i, j;
 
-       do
-       {
+       do {
                i = ranf(NSECTS);
                j = ranf(NSECTS);
        } while (Sect[i][j] != EMPTY);