summaryrefslogtreecommitdiff
path: root/games/sail/game.c
diff options
context:
space:
mode:
authorPaul Janzen <pjanzen@cvs.openbsd.org>1999-01-18 06:20:55 +0000
committerPaul Janzen <pjanzen@cvs.openbsd.org>1999-01-18 06:20:55 +0000
commit5134b02ec45c91ead7868a5b9f0cea921d296a7c (patch)
tree7a1b1519d35853321a624d35e4df02324a7b4e70 /games/sail/game.c
parent44f356a1eef9aaed32b992d35566e9f7e7d0db8c (diff)
NetBSD merge with additional fixes from jsm28@cam.ac.uk. This game still
needs much more work.
Diffstat (limited to 'games/sail/game.c')
-rw-r--r--games/sail/game.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/games/sail/game.c b/games/sail/game.c
index a6ecc4fc090..d4adeddb133 100644
--- a/games/sail/game.c
+++ b/games/sail/game.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: game.c,v 1.2 1999/01/18 06:20:52 pjanzen Exp $ */
/* $NetBSD: game.c,v 1.3 1995/04/22 10:36:56 cgd Exp $ */
/*
@@ -35,22 +36,23 @@
#ifndef lint
#if 0
-static char sccsid[] = "@(#)game.c 8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)game.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$NetBSD: game.c,v 1.3 1995/04/22 10:36:56 cgd Exp $";
+static char rcsid[] = "$OpenBSD: game.c,v 1.2 1999/01/18 06:20:52 pjanzen Exp $";
#endif
#endif /* not lint */
-#include "externs.h"
+#include "extern.h"
+int
maxturns(ship, af)
-register struct ship *ship;
-char *af;
+ struct ship *ship;
+ char *af;
{
- register int turns;
+ int turns;
turns = ship->specs->ta;
- if (*af = (ship->file->drift > 1 && turns)) {
+ if ((*af = (ship->file->drift > 1 && turns)) != 0) {
turns--;
if (ship->file->FS == 1)
turns = 0;
@@ -58,11 +60,12 @@ char *af;
return turns;
}
+int
maxmove(ship, dir, fs)
-register struct ship *ship;
-int dir, fs;
+ struct ship *ship;
+ int dir, fs;
{
- register int riggone = 0, Move, flank = 0;
+ int riggone = 0, Move, flank = 0;
Move = ship->specs->bs;
if (!ship->specs->rig1)