diff options
| author | christos <christos@NetBSD.org> | 1997-10-13 19:42:53 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 1997-10-13 19:42:53 +0000 |
| commit | 7e5c0c57606f0f1e9335aa74ef5ea8c8048a9b2c (patch) | |
| tree | e32f911a4774980914f141c9b101745fb106eefe /sail/pl_6.c | |
| parent | c1a3f2353b38d22d94cbc0101f3115b8e2eefc30 (diff) | |
| download | bsdgames-darwin-7e5c0c57606f0f1e9335aa74ef5ea8c8048a9b2c.tar.gz bsdgames-darwin-7e5c0c57606f0f1e9335aa74ef5ea8c8048a9b2c.zip | |
Warns fixes:
use varargs properly
use unsigned chars where appropriate
fix typos
eliminate gcc warnings
Diffstat (limited to 'sail/pl_6.c')
| -rw-r--r-- | sail/pl_6.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/sail/pl_6.c b/sail/pl_6.c index 03f339bd..e684035d 100644 --- a/sail/pl_6.c +++ b/sail/pl_6.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_6.c,v 1.3 1995/04/22 10:37:15 cgd Exp $ */ +/* $NetBSD: pl_6.c,v 1.4 1997/10/13 19:45:33 christos Exp $ */ /* * Copyright (c) 1983, 1993 @@ -33,28 +33,30 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)pl_6.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$NetBSD: pl_6.c,v 1.3 1995/04/22 10:37:15 cgd Exp $"; +__RCSID("$NetBSD: pl_6.c,v 1.4 1997/10/13 19:45:33 christos Exp $"); #endif #endif /* not lint */ #include "player.h" +void repair() { char c; - register char *repairs; - register struct shipspecs *ptr = mc; - register int count; + char *repairs; + struct shipspecs *ptr = mc; + int count; #define FIX(x, m) (m - ptr->x > count \ ? (ptr->x += count, count = 0) : (count -= m - ptr->x, ptr->x = m)) if (repaired || loaded || fired || changed || turned()) { - Signal("No hands free to repair", (struct ship *)0); + Msg("No hands free to repair"); return; } c = sgetch("Repair (hull, guns, rigging)? ", (struct ship *)0, 1); @@ -69,7 +71,7 @@ repair() repairs = &mf->RR; break; default: - Signal("Avast heaving!", (struct ship *)0); + Msg("Avast heaving!"); return; } if (++*repairs >= 3) { @@ -121,7 +123,7 @@ repair() break; } if (count == 2) { - Signal("Repairs completed.", (struct ship *)0); + Msg("Repairs completed."); *repairs = 2; } else { *repairs = 0; @@ -136,9 +138,10 @@ repair() repaired = 1; } +int turned() { - register char *p; + char *p; for (p = movebuf; *p; p++) if (*p == 'r' || *p == 'l') @@ -146,13 +149,14 @@ turned() return 0; } +void loadplayer() { char c; - register loadL, loadR, ready, load; + int loadL, loadR, ready, load; if (!mc->crew3) { - Signal("Out of crew", (struct ship *)0); + Msg("Out of crew"); return; } loadL = mf->loadL; @@ -165,7 +169,7 @@ loadplayer() else loadR = 1; } - if (!loadL && loadR || loadL && !loadR) { + if ((!loadL && loadR) || (loadL && !loadR)) { c = sgetch("Reload with (round, double, chain, grape)? ", (struct ship *)0, 1); switch (c) { @@ -186,8 +190,7 @@ loadplayer() ready = 0; break; default: - Signal("Broadside not loaded.", - (struct ship *)0); + Msg("Broadside not loaded."); return; } if (!loadR) { |