Fix merge conflicts

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

diff --git a/trek/lrscan.c b/trek/lrscan.c
index 041387127b07bc95fc151f4d7d81ca3564073c8e..7501fee07694163b0cbd4cc9289029d89c965371 100644 (file)
--- a/trek/lrscan.c
+++ b/trek/lrscan.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: lrscan.c,v 1.8 2009/05/24 19:18:44 dholland Exp $      */
+/*     $NetBSD: lrscan.c,v 1.10 2009/05/24 22:55:03 dholland Exp $     */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #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.10 2009/05/24 22:55:03 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,15 +60,14 @@ 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);
+       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(int v __unused)
        }
 
        /* 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(int v __unused)
 
                /* 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;