X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/04f4d7044367099914cf1906ae27ac20c24e44cf..0b4c3861ae9de303c21256a9cc084c79c4fed743:/sail/pl_3.c diff --git a/sail/pl_3.c b/sail/pl_3.c index be5cbb21..b638acc4 100644 --- a/sail/pl_3.c +++ b/sail/pl_3.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_3.c,v 1.8 1999/09/08 21:17:59 jsm Exp $ */ +/* $NetBSD: pl_3.c,v 1.20 2009/03/15 03:33:56 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,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. - * 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. * @@ -38,15 +34,17 @@ #if 0 static char sccsid[] = "@(#)pl_3.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_3.c,v 1.8 1999/09/08 21:17:59 jsm Exp $"); +__RCSID("$NetBSD: pl_3.c,v 1.20 2009/03/15 03:33:56 dholland Exp $"); #endif #endif /* not lint */ -#include "player.h" +#include #include +#include "extern.h" +#include "player.h" void -acceptcombat() +acceptcombat(void) { int men = 0; int target, temp; @@ -87,7 +85,8 @@ 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; @@ -177,7 +176,7 @@ acceptcombat() if (windspeed == 6 && temp <= 3) hit--; if (hit >= 0) { - roll = die(); + roll = dieroll(); if (load == L_GRAPE) chits = hit; else { @@ -197,7 +196,7 @@ acceptcombat() hhits = 0; } } - table(shootat, load, hit, closest, ms, roll); + table(ms, closest, shootat, load, hit, roll); } Msg("Damage inflicted on the %s:", closest->shipname); Msg("\t%d HULL, %d GUNS, %d CREW, %d RIGGING", @@ -213,13 +212,10 @@ acceptcombat() cant: Msg("Unable to fire %s broadside", r ? "right" : "left"); } - blockalarm(); - draw_stat(); - unblockalarm(); } void -grapungrap() +grapungrap(void) { struct ship *sp; int i; @@ -232,10 +228,10 @@ grapungrap() switch (sgetch("Attempt to grapple or ungrapple $$: ", sp, 1)) { case 'g': - if (die() < 3 + if (dieroll() < 3 || ms->nationality == capship(sp)->nationality) { - Write(W_GRAP, ms, sp->file->index, 0, 0, 0); - Write(W_GRAP, sp, player, 0, 0, 0); + send_grap(ms, sp->file->index); + send_grap(sp, player); Msg("Attempt succeeds!"); makesignal(ms, "grappled with $$", sp); } else @@ -245,7 +241,7 @@ grapungrap() for (i = grappled2(ms, sp); --i >= 0;) { if (ms->nationality == capship(sp)->nationality - || die() < 3) { + || dieroll() < 3) { cleangrapple(ms, sp, 0); Msg("Attempt succeeds!"); makesignal(ms, "ungrappling with $$", @@ -259,7 +255,7 @@ grapungrap() } void -unfoulplayer() +unfoulplayer(void) { struct ship *to; int i; @@ -270,7 +266,7 @@ unfoulplayer() if (sgetch("Attempt to unfoul with the $$? ", to, 1) != 'y') continue; for (i = fouled2(ms, to); --i >= 0;) { - if (die() <= 2) { + if (dieroll() <= 2) { cleanfoul(ms, to, 0); Msg("Attempt succeeds!"); makesignal(ms, "Unfouling $$", to);