Principally, change foo(N) to .Xr foo N

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

diff --git a/sail/pl_3.c b/sail/pl_3.c
index c860ec7ca5535012998f70d36fd4e00692d50fe3..b571bb9da1e1c9df9c77fd4face93af820bad664 100644 (file)
--- a/sail/pl_3.c
+++ b/sail/pl_3.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_3.c,v 1.3 1995/04/22 10:37:09 cgd Exp $     */
+/*     $NetBSD: pl_3.c,v 1.5 1997/10/13 21:04:09 christos Exp $        */
 
 /*
  * Copyright (c) 1983, 1993
@@ -33,16 +33,19 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)pl_3.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: pl_3.c,v 1.3 1995/04/22 10:37:09 cgd Exp $";
+__RCSID("$NetBSD: pl_3.c,v 1.5 1997/10/13 21:04:09 christos Exp $");
 #endif
 #endif /* not lint */
 
 #include "player.h"
+#include <stdlib.h>
 
+void
 acceptcombat()
 {
        int men = 0;
@@ -84,7 +87,7 @@ acceptcombat()
                        guns = mc->gunL;
                        car = mc->carL;
                }
-               if (!guns && !car || load == L_EMPTY || (ready & R_LOADED) == 0)
+               if ((!guns && !car) || load == L_EMPTY || (ready & R_LOADED) == 0)
                        goto cant;
                if (mf->struck || !crew[2])
                        goto cant;
@@ -94,9 +97,9 @@ acceptcombat()
                if (closest->file->struck)
                        goto cant;
                target = range(ms, closest);
-               if (target > rangeofshot[load] || !guns && target >= 3)
+               if (target > rangeofshot[load] || (!guns && target >= 3))
                        goto cant;
-               Signal("%s (%c%c) within range of %s broadside.",
+               Signal("$$ within range of %s broadside.",
                        closest, r ? "right" : "left");
                if (load > L_CHAIN && target < 6) {
                        switch (sgetch("Aim for hull or rigging? ",
@@ -109,14 +112,12 @@ acceptcombat()
                                break;
                        default:
                                shootat = -1;
-                               Signal("'Avast there! Hold your fire.'",
-                                       (struct ship *)0);
+                               Msg("'Avast there! Hold your fire.'");
                        }
                } else {
                        if (sgetch("Fire? ", (struct ship *)0, 1) == 'n') {
                                shootat = -1;
-                               Signal("Belay that! Hold your fire.",
-                                       (struct ship *)0);
+                               Msg("Belay that! Hold your fire.");
                        } else
                                shootat = RIGGING;
                }
@@ -132,9 +133,10 @@ acceptcombat()
                sternrake = temp > 4 && temp < 6;
                if (rakehim)
                        if (!sternrake)
-                               Signal("Raking the %s!", closest);
+                               Msg("Raking the %s!", closest->shipname);
                        else
-                               Signal("Stern Rake! %s splintering!", closest);
+                               Msg("Stern Rake! %s splintering!",
+                                   closest->shipname);
                index = guns;
                if (target < 3)
                        index += car;
@@ -193,10 +195,9 @@ acceptcombat()
                        }
                        table(shootat, load, hit, closest, ms, roll);
                }
-               Signal("Damage inflicted on the %s:",
-                       (struct ship *)0, closest->shipname);
-               Signal("\t%d HULL, %d GUNS, %d CREW, %d RIGGING",
-                       (struct ship *)0, hhits, ghits, chits, rhits);
+               Msg("Damage inflicted on the %s:", closest->shipname);
+               Msg("\t%d HULL, %d GUNS, %d CREW, %d RIGGING",
+                   hhits, ghits, chits, rhits);
                if (!r) {
                        mf->loadL = L_EMPTY;
                        mf->readyL = R_EMPTY;
@@ -206,35 +207,35 @@ acceptcombat()
                }
                continue;
        cant:
-               Signal("Unable to fire %s broadside",
-                       (struct ship *)0, r ? "right" : "left");
+               Msg("Unable to fire %s broadside", r ? "right" : "left");
        }
        blockalarm();
        draw_stat();
        unblockalarm();
 }
 
+void
 grapungrap()
 {
-       register struct ship *sp;
-       register int i;
+       struct ship *sp;
+       int i;
 
        foreachship(sp) {
                if (sp == ms || sp->file->dir == 0)
                        continue;
                if (range(ms, sp) > 1 && !grappled2(ms, sp))
                        continue;
-               switch (sgetch("Attempt to grapple or ungrapple %s (%c%c): ",
+               switch (sgetch("Attempt to grapple or ungrapple $$: ",
                        sp, 1)) {
                case 'g':
                        if (die() < 3
                            || ms->nationality == capship(sp)->nationality) {
                                Write(W_GRAP, ms, 0, sp->file->index, 0, 0, 0);
                                Write(W_GRAP, sp, 0, player, 0, 0, 0);
-                               Signal("Attempt succeeds!", (struct ship *)0);
-                               makesignal(ms, "grappled with %s (%c%c)", sp);
+                               Msg("Attempt succeeds!");
+                               makesignal(ms, "grappled with $$", sp);
                        } else
-                               Signal("Attempt fails.", (struct ship *)0);
+                               Msg("Attempt fails.");
                        break;
                case 'u':
                        for (i = grappled2(ms, sp); --i >= 0;) {
@@ -242,37 +243,35 @@ grapungrap()
                                        == capship(sp)->nationality
                                    || die() < 3) {
                                        cleangrapple(ms, sp, 0);
-                                       Signal("Attempt succeeds!",
-                                               (struct ship *)0);
-                                       makesignal(ms,
-                                               "ungrappling with %s (%c%c)",
+                                       Msg("Attempt succeeds!");
+                                       makesignal(ms, "ungrappling with $$",
                                                sp);
                                } else
-                                       Signal("Attempt fails.",
-                                               (struct ship *)0);
+                                       Msg("Attempt fails.");
                        }
                        break;
                }
        }
 }
 
+void
 unfoulplayer()
 {
-       register struct ship *to;
-       register i;
+       struct ship *to;
+       int i;
 
        foreachship(to) {
                if (fouled2(ms, to) == 0)
                        continue;
-               if (sgetch("Attempt to unfoul with the %s (%c%c)? ", to, 1) != 'y')
+               if (sgetch("Attempt to unfoul with the $$? ", to, 1) != 'y')
                        continue;
                for (i = fouled2(ms, to); --i >= 0;) {
                        if (die() <= 2) {
                                cleanfoul(ms, to, 0);
-                               Signal("Attempt succeeds!", (struct ship *)0);
-                               makesignal(ms, "Unfouling %s (%c%c)", to);
+                               Msg("Attempt succeeds!");
+                               makesignal(ms, "Unfouling $$", to);
                        } else
-                               Signal("Attempt fails.", (struct ship *)0);
+                               Msg("Attempt fails.");
                }
        }
 }