Rework curses handling.

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

diff --git a/sail/pl_3.c b/sail/pl_3.c
index 38b7ae173d1c735d4ef28164e928654307ac54e2..b638acc4158d597c732af91bfeb12085a8d6fc03 100644 (file)
--- a/sail/pl_3.c
+++ b/sail/pl_3.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: pl_3.c,v 1.20 2009/03/15 03:33:56 dholland Exp $       */
+

 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -10,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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -31,13 +29,22 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)pl_3.c     5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)pl_3.c     8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: pl_3.c,v 1.20 2009/03/15 03:33:56 dholland Exp $");
+#endif

 #endif /* not lint */
 
 #endif /* not lint */
 

+#include <signal.h>
+#include <stdlib.h>
+#include "extern.h"

 #include "player.h"
 
 #include "player.h"
 

-acceptcombat()
+void
+acceptcombat(void)

 {
        int men = 0;
        int target, temp;
 {
        int men = 0;
        int target, temp;


@@ -78,7 +85,8 @@ acceptcombat()
                        guns = mc->gunL;
                        car = mc->carL;
                }
                        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;
                        goto cant;
                if (mf->struck || !crew[2])
                        goto cant;


@@ -88,9 +96,9 @@ acceptcombat()
                if (closest->file->struck)
                        goto cant;
                target = range(ms, closest);
                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;
                        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? ",
                        closest, r ? "right" : "left");
                if (load > L_CHAIN && target < 6) {
                        switch (sgetch("Aim for hull or rigging? ",


@@ -103,14 +111,12 @@ acceptcombat()
                                break;
                        default:
                                shootat = -1;
                                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;
                        }
                } 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;
                }
                        } else
                                shootat = RIGGING;
                }


@@ -124,11 +130,13 @@ acceptcombat()
                else if (temp > 8)
                        temp -= 8;
                sternrake = temp > 4 && temp < 6;
                else if (temp > 8)
                        temp -= 8;
                sternrake = temp > 4 && temp < 6;

-               if (rakehim)
+               if (rakehim) {

                        if (!sternrake)
                        if (!sternrake)

-                               Signal("Raking the %s!", closest);
+                               Msg("Raking the %s!", closest->shipname);

                        else
                        else

-                               Signal("Stern Rake! %s splintering!", closest);
+                               Msg("Stern Rake! %s splintering!",
+                                   closest->shipname);
+               }

                index = guns;
                if (target < 3)
                        index += car;
                index = guns;
                if (target < 3)
                        index += car;


@@ -142,21 +150,24 @@ acceptcombat()
                        hit++;
                hit += QUAL[index][mc->qual-1];
                for (n = 0; n < 3 && mf->captured == 0; n++)
                        hit++;
                hit += QUAL[index][mc->qual-1];
                for (n = 0; n < 3 && mf->captured == 0; n++)

-                       if (!crew[n])
+                       if (!crew[n]) {

                                if (index <= 5)
                                        hit--;
                                else
                                        hit -= 2;
                                if (index <= 5)
                                        hit--;
                                else
                                        hit -= 2;

-               if (ready & R_INITIAL)
+                       }
+               if (ready & R_INITIAL) {

                        if (index <= 3)
                                hit++;
                        else
                                hit += 2;
                        if (index <= 3)
                                hit++;
                        else
                                hit += 2;

-               if (mf->captured != 0)
+               }
+               if (mf->captured != 0) {

                        if (index <= 1)
                                hit--;
                        else
                                hit -= 2;
                        if (index <= 1)
                                hit--;
                        else
                                hit -= 2;

+               }

                hit += AMMO[index][load - 1];
                if (((temp = mc->class) >= 5 || temp == 1) && windspeed == 5)
                        hit--;
                hit += AMMO[index][load - 1];
                if (((temp = mc->class) >= 5 || temp == 1) && windspeed == 5)
                        hit--;


@@ -165,11 +176,11 @@ acceptcombat()
                if (windspeed == 6 && temp <= 3)
                        hit--;
                if (hit >= 0) {
                if (windspeed == 6 && temp <= 3)
                        hit--;
                if (hit >= 0) {

-                       roll = die();
+                       roll = dieroll();

                        if (load == L_GRAPE)
                                chits = hit;
                        else {
                        if (load == L_GRAPE)
                                chits = hit;
                        else {

-                               struct Tables *t;
+                               const struct Tables *t;

                                if (hit > 10)
                                        hit = 10;
                                t = &(shootat == RIGGING ? RigTable : HullTable)
                                if (hit > 10)
                                        hit = 10;
                                t = &(shootat == RIGGING ? RigTable : HullTable)


@@ -185,12 +196,11 @@ acceptcombat()
                                        hhits = 0;
                                }
                        }
                                        hhits = 0;
                                }
                        }

-                       table(shootat, load, hit, closest, ms, roll);
+                       table(ms, closest, shootat, load, hit, 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;
                if (!r) {
                        mf->loadL = L_EMPTY;
                        mf->readyL = R_EMPTY;


@@ -200,73 +210,68 @@ acceptcombat()
                }
                continue;
        cant:
                }
                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();

 }
 
 }
 

-grapungrap()
+void
+grapungrap(void)

 {
 {

-       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;
 
        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':
                        sp, 1)) {
                case 'g':

-                       if (die() < 3
+                       if (dieroll() < 3

                            || ms->nationality == capship(sp)->nationality) {
                            || 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);
+                               send_grap(ms, sp->file->index);
+                               send_grap(sp, player);
+                               Msg("Attempt succeeds!");
+                               makesignal(ms, "grappled with $$", sp);

                        } else
                        } else

-                               Signal("Attempt fails.", (struct ship *)0);
+                               Msg("Attempt fails.");

                        break;
                case 'u':
                        for (i = grappled2(ms, sp); --i >= 0;) {
                                if (ms->nationality
                                        == capship(sp)->nationality
                        break;
                case 'u':
                        for (i = grappled2(ms, sp); --i >= 0;) {
                                if (ms->nationality
                                        == capship(sp)->nationality

-                                   || die() < 3) {
+                                   || dieroll() < 3) {

                                        cleangrapple(ms, sp, 0);
                                        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
                                                sp);
                                } else

-                                       Signal("Attempt fails.",
-                                               (struct ship *)0);
+                                       Msg("Attempt fails.");

                        }
                        break;
                }
        }
 }
 
                        }
                        break;
                }
        }
 }
 

-unfoulplayer()
+void
+unfoulplayer(void)

 {
 {

-       register struct ship *to;
-       register i;
+       struct ship *to;
+       int i;

 
        foreachship(to) {
                if (fouled2(ms, to) == 0)
                        continue;
 
        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;) {
                        continue;
                for (i = fouled2(ms, to); --i >= 0;) {

-                       if (die() <= 2) {
+                       if (dieroll() <= 2) {

                                cleanfoul(ms, to, 0);
                                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
                        } else

-                               Signal("Attempt fails.", (struct ship *)0);
+                               Msg("Attempt fails.");

                }
        }
 }
                }
        }
 }