Integrate Warp Kit into the NetBSD build

[bsdgames-darwin.git] / battlestar / fly.c

diff --git a/battlestar/fly.c b/battlestar/fly.c
index 1652aa073dbd61175977922f0e5acfbd123c1eaa..85175b6fcef213060c894f289670623316828701 100644 (file)
--- a/battlestar/fly.c
+++ b/battlestar/fly.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: fly.c,v 1.11 2003/08/07 09:37:02 agc Exp $     */
+/*     $NetBSD: fly.c,v 1.15 2012/10/13 19:58:53 dholland Exp $        */
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,13 +34,14 @@
 #if 0
 static char sccsid[] = "@(#)fly.c      8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: fly.c,v 1.11 2003/08/07 09:37:02 agc Exp $");
+__RCSID("$NetBSD: fly.c,v 1.15 2012/10/13 19:58:53 dholland Exp $");
 #endif
 #endif                         /* not lint */
 
 #include "extern.h"
 #undef UP
 #include <curses.h>
+#include <assert.h>
 
 #define MIDR  (LINES/2 - 1)
 #define MIDC  (COLS/2 - 1)
@@ -52,17 +53,16 @@ int     ourclock = 120;             /* time for all the flights in the game */
 static char    cross = 0;
 static sig_t   oldsig;
 
-static void blast __P((void));
-static void endfly __P((void));
-static void moveenemy __P((int));
-static void notarget __P((void));
-static void screen __P((void));
-static void succumb __P((int));
-static void target __P((void));
+static void blast(void);
+static void endfly(void);
+static void moveenemy(int);
+static void notarget(void);
+static void screen(void);
+static void succumb(int);
+static void target(void);
 
 static void
-succumb(dummy)
-       int     dummy __attribute__((__unused__));
+succumb(int dummy __unused)
 {
        if (oldsig == SIG_DFL) {
                endfly();
@@ -75,7 +75,7 @@ succumb(dummy)
 }
 
 int
-visual()
+visual(void)
 {
        destroyed = 0;
        if (initscr() == NULL) {
@@ -151,7 +151,8 @@ visual()
                        if (torps) {
                                torps -= 2;
                                blast();
-                               if (row == MIDR && column - MIDC < 2 && MIDC - column < 2) {
+                               if (row == MIDR && column < MIDC + 2 && 
+                                   column > MIDC - 2) {
                                        destroyed = 1;
                                        alarm(0);
                                }
@@ -182,7 +183,7 @@ visual()
 }
 
 static void
-screen()
+screen(void)
 {
        int     r, c, n;
        int     i;
@@ -199,7 +200,7 @@ screen()
 }
 
 static void
-target()
+target(void)
 {
        int     n;
 
@@ -212,7 +213,7 @@ target()
 }
 
 static void
-notarget()
+notarget(void)
 {
        int     n;
 
@@ -225,7 +226,7 @@ notarget()
 }
 
 static void
-blast()
+blast(void)
 {
        int     n;
 
@@ -247,8 +248,7 @@ blast()
 }
 
 static void
-moveenemy(dummy)
-       int     dummy __attribute__((__unused__));
+moveenemy(int dummy __unused)
 {
        double  d;
        int     oldr, oldc;
@@ -265,7 +265,8 @@ moveenemy(dummy)
                        fuel = 0;
                        mvaddstr(0, 60, "*** Out of fuel ***");
                }
-       d = (double) ((row - MIDR) * (row - MIDR) + (column - MIDC) * (column - MIDC));
+       d = (double) ((row - MIDR) * (row - MIDR) + (column - MIDC) * 
+           (column - MIDC));
        if (d < 16) {
                row += (rnd(9) - 4) % (4 - abs(row - MIDR));
                column += (rnd(9) - 4) % (4 - abs(column - MIDC));
@@ -287,7 +288,7 @@ moveenemy(dummy)
 }
 
 static void
-endfly()
+endfly(void)
 {
        alarm(0);
        signal(SIGALRM, SIG_DFL);