Fix merge conflicts

[bsdgames-darwin.git] / sail / game.c

diff --git a/sail/game.c b/sail/game.c
index 5819a6e8a67cc7cf4d616e98089cee191fd63f87..20d6d83c5346e0839427dc3c4dbe2880a1e9ee6c 100644 (file)
--- a/sail/game.c
+++ b/sail/game.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: game.c,v 1.8 2001/01/04 01:53:24 jwise Exp $   */
+/*     $NetBSD: game.c,v 1.13 2009/03/14 20:04:43 dholland Exp $       */
 
 /*
  * Copyright (c) 1983, 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.
  *
@@ -38,23 +34,22 @@
 #if 0
 static char sccsid[] = "@(#)game.c     8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: game.c,v 1.8 2001/01/04 01:53:24 jwise Exp $");
+__RCSID("$NetBSD: game.c,v 1.13 2009/03/14 20:04:43 dholland Exp $");
 #endif
 #endif /* not lint */
 
+#include <sys/types.h>
+#include <stdbool.h>
 #include "extern.h"
 
-int    maxturns(struct ship *, char *);
-int    maxmove(struct ship *, int, int);
-
 int
-maxturns(struct ship *ship, char *af)
+maxturns(struct ship *ship, bool *af)
 {
        int turns;
 
        turns = ship->specs->ta;
        *af = (ship->file->drift > 1 && turns);
-       if (*af != '\0') {
+       if (*af != false) {
                turns--;
                if (ship->file->FS == 1)
                        turns = 0;
@@ -82,13 +77,15 @@ maxmove(struct ship *ship, int dir, int fs)
        }
        if (dir == winddir)
                Move -= 1 + WET[windspeed][ship->specs->class-1].B;
-       else if (dir == winddir + 2 || dir == winddir - 2 || dir == winddir - 6 || dir == winddir + 6)
+       else if (dir == winddir + 2 || dir == winddir - 2 ||
+                dir == winddir - 6 || dir == winddir + 6)
                Move -= 1 + WET[windspeed][ship->specs->class-1].C;
-       else if (dir == winddir + 3 || dir == winddir - 3 || dir == winddir - 5 || dir == winddir + 5)
+       else if (dir == winddir + 3 || dir == winddir - 3 ||
+                dir == winddir - 5 || dir == winddir + 5)
                Move = (flank ? 2 : 1) - WET[windspeed][ship->specs->class-1].D;
        else if (dir == winddir + 4 || dir == winddir - 4)
                Move = 0;
-       else 
+       else
                Move -= WET[windspeed][ship->specs->class-1].A;
        Move -= riggone;
        Move = Move < 0 ? 0 : Move;