Fix merge conflicts

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

diff --git a/trek/lrscan.c b/trek/lrscan.c
index 4d6e7d80c3c069c073676bafeb9441a2e8aaff14..7501fee07694163b0cbd4cc9289029d89c965371 100644 (file)
--- a/trek/lrscan.c
+++ b/trek/lrscan.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: lrscan.c,v 1.3 1995/04/22 10:59:09 cgd Exp $   */
+/*     $NetBSD: lrscan.c,v 1.10 2009/05/24 22:55:03 dholland Exp $     */
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,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.
  *
@@ -33,15 +29,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)lrscan.c   8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: lrscan.c,v 1.3 1995/04/22 10:59:09 cgd Exp $";
+__RCSID("$NetBSD: lrscan.c,v 1.10 2009/05/24 22:55:03 dholland Exp $");
 #endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include "trek.h"
 
 /*
 **  LONG RANGE OF SCANNERS
@@ -55,20 +53,21 @@ static char rcsid[] = "$NetBSD: lrscan.c,v 1.3 1995/04/22 10:59:09 cgd Exp $";
 **     for future use by the "chart" option of the computer.
 */
 
-lrscan()
+/*ARGSUSED*/
+void
+lrscan(int v __unused)
 {
-       register int                    i, j;
-       register struct quad            *q;
+       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);
+       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
@@ -76,11 +75,9 @@ lrscan()
        }
 
        /* 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;
@@ -88,17 +85,14 @@ lrscan()
 
                /* print the left hand margin */
                printf("%1d !", i);
-               for (j = Ship.quady - 1; j <= Ship.quady + 1; j++)
-               {
-                       if (j < 0 || j >= NQUADS)
-                       {
+               for (j = Ship.quady - 1; j <= Ship.quady + 1; j++) {
+                       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;