cgram: rewrite completely, fixing bugs and style

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

diff --git a/trek/snova.c b/trek/snova.c
index b3b3ed46f519d5bea778747029893a6bb051bf6b..90baf75acb5b78cc3f14e4b155251e74b65fa096 100644 (file)
--- a/trek/snova.c
+++ b/trek/snova.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: snova.c,v 1.8 2009/05/24 21:55:24 dholland Exp $       */
+/*     $NetBSD: snova.c,v 1.10 2018/02/08 09:05:16 dholland Exp $      */

 
 /*
  * Copyright (c) 1980, 1993
 
 /*
  * Copyright (c) 1980, 1993


@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)snova.c    8.1 (Berkeley) 5/31/93";
 #else
 #if 0
 static char sccsid[] = "@(#)snova.c    8.1 (Berkeley) 5/31/93";
 #else

-__RCSID("$NetBSD: snova.c,v 1.8 2009/05/24 21:55:24 dholland Exp $");
+__RCSID("$NetBSD: snova.c,v 1.10 2018/02/08 09:05:16 dholland Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -89,7 +89,8 @@ snova(int x, int y)
                        n = ranf(q->stars);
                        for (ix = 0; ix < NSECTS; ix++) {
                                for (iy = 0; iy < NSECTS; iy++)
                        n = ranf(q->stars);
                        for (ix = 0; ix < NSECTS; ix++) {
                                for (iy = 0; iy < NSECTS; iy++)

-                                       if (Sect[ix][iy] == STAR || Sect[ix][iy] == INHABIT)
+                                       if (Sect[ix][iy] == STAR ||
+                                           Sect[ix][iy] == INHABIT)

                                                if ((n -= 1) <= 0)
                                                        break;
                                if (n <= 0)
                                                if ((n -= 1) <= 0)
                                                        break;
                                if (n <= 0)


@@ -107,7 +108,7 @@ snova(int x, int y)
        }
        if (f) {
                /* supernova is in same quadrant as Enterprise */
        }
        if (f) {
                /* supernova is in same quadrant as Enterprise */

-               printf("\a\nRED ALERT: supernova occuring at %d,%d\n", ix, iy);
+               printf("\a\nRED ALERT: supernova occurring at %d,%d\n", ix, iy);

                dx = ix - Ship.sectx;
                dy = iy - Ship.secty;
                if (dx * dx + dy * dy <= 2) {
                dx = ix - Ship.sectx;
                dy = iy - Ship.secty;
                if (dx * dx + dy * dy <= 2) {


@@ -120,8 +121,10 @@ snova(int x, int y)
        } else {
                if (!damaged(SSRADIO)) {
                        q->scanned = 1000;
        } else {
                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);
+                       printf("\nUhura: Captain, Starfleet Command reports "
+                              "a supernova\n");
+                       printf("  in quadrant %d,%d.  Caution is advised\n",
+                               qx, qy);

                }
        }
 
                }
        }
 


@@ -143,7 +146,8 @@ snova(int x, int y)
        q->stars = -1;
        q->klings = 0;
        if (Now.klings <= 0) {
        q->stars = -1;
        q->klings = 0;
        if (Now.klings <= 0) {

-               printf("Lucky devil, that supernova destroyed the last klingon\n");
+               printf("Lucky devil, that supernova destroyed the last "
+                      "klingon\n");

                win();
        }
        return;
                win();
        }
        return;