Fix merge conflicts

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

diff --git a/sail/game.c b/sail/game.c
index adab8266dcb87753fd3bc7f7cddbd7fbf07d5e4a..20d6d83c5346e0839427dc3c4dbe2880a1e9ee6c 100644 (file)
--- a/sail/game.c
+++ b/sail/game.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: game.c,v 1.12 2009/03/14 19:35:13 dholland Exp $       */
+/*     $NetBSD: game.c,v 1.13 2009/03/14 20:04:43 dholland Exp $       */
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,21 +34,22 @@
 #if 0
 static char sccsid[] = "@(#)game.c     8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: game.c,v 1.12 2009/03/14 19:35:13 dholland 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 *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;