mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-13 10:02:38 +00:00
Fix breakage in previous commit.
This commit is contained in:
parent
15e01db88b
commit
8368e7fe41
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=53219
@ -44,7 +44,7 @@ unfoul()
|
||||
struct ship *sp;
|
||||
struct ship *to;
|
||||
int nat;
|
||||
i;
|
||||
int i;
|
||||
|
||||
foreachship(sp) {
|
||||
if (sp->file->captain[0])
|
||||
@ -258,7 +258,7 @@ resolve()
|
||||
|
||||
compcombat()
|
||||
{
|
||||
n;
|
||||
int n;
|
||||
struct ship *sp;
|
||||
struct ship *closest;
|
||||
int crew[3], men = 0, target, temp;
|
||||
|
@ -283,7 +283,7 @@ struct ship *ship, *to;
|
||||
int isdefense, count;
|
||||
{
|
||||
struct BP *bp;
|
||||
obp = 0;
|
||||
int obp = 0;
|
||||
int n, OBP = 0, DBP = 0, dbp = 0;
|
||||
int qual;
|
||||
|
||||
|
@ -42,7 +42,7 @@ static char sccsid[] = "@(#)dr_4.c 8.1 (Berkeley) 5/31/93";
|
||||
ungrap(from, to)
|
||||
struct ship *from, *to;
|
||||
{
|
||||
k;
|
||||
int k;
|
||||
char friend;
|
||||
|
||||
if ((k = grappled2(from, to)) == 0)
|
||||
|
@ -46,7 +46,7 @@ static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93";
|
||||
range(from, to)
|
||||
struct ship *from, *to;
|
||||
{
|
||||
bow1r, bow1c, bow2r, bow2c;
|
||||
int bow1r, bow1c, bow2r, bow2c;
|
||||
int stern1r, stern1c, stern2c, stern2r;
|
||||
int bb, bs, sb, ss, result;
|
||||
|
||||
@ -100,9 +100,9 @@ char side, anyship;
|
||||
}
|
||||
|
||||
angle(dr, dc)
|
||||
dr, dc;
|
||||
int dr, dc;
|
||||
{
|
||||
i;
|
||||
int i;
|
||||
|
||||
if (dc >= 0 && dr > 0)
|
||||
i = 0;
|
||||
@ -130,7 +130,7 @@ gunsbear(from, to) /* checks for target bow or stern */
|
||||
struct ship *from, *to;
|
||||
{
|
||||
int Dr, Dc, i;
|
||||
ang;
|
||||
int ang;
|
||||
|
||||
Dr = from->file->row - to->file->row;
|
||||
Dc = to->file->col - from->file->col;
|
||||
@ -151,8 +151,8 @@ portside(from, on, quick)
|
||||
struct ship *from, *on;
|
||||
int quick; /* returns true if fromship is */
|
||||
{ /* shooting at onship's starboard side */
|
||||
ang;
|
||||
Dr, Dc;
|
||||
int ang;
|
||||
int Dr, Dc;
|
||||
|
||||
Dr = from->file->row - on->file->row;
|
||||
Dc = on->file->col - from->file->col;
|
||||
|
@ -70,7 +70,7 @@ struct ship *ship, *to;
|
||||
char isdefense;
|
||||
{
|
||||
struct BP *p = isdefense ? ship->file->DBP : ship->file->OBP;
|
||||
n;
|
||||
int n;
|
||||
|
||||
for (n = 0; n < NBP; p++, n++)
|
||||
if (p->turnsent && (p->toship == to || isdefense || ship == to))
|
||||
|
@ -259,7 +259,7 @@ grapungrap()
|
||||
unfoulplayer()
|
||||
{
|
||||
struct ship *to;
|
||||
i;
|
||||
int i;
|
||||
|
||||
foreachship(to) {
|
||||
if (fouled2(ms, to) == 0)
|
||||
|
@ -145,7 +145,7 @@ turned()
|
||||
loadplayer()
|
||||
{
|
||||
char c;
|
||||
loadL, loadR, ready, load;
|
||||
int loadL, loadR, ready, load;
|
||||
|
||||
if (!mc->crew3) {
|
||||
Signal("Out of crew", (struct ship *)0);
|
||||
|
@ -189,7 +189,7 @@ char *p;
|
||||
struct ship *ship;
|
||||
char flag;
|
||||
{
|
||||
c;
|
||||
int c;
|
||||
|
||||
prompt(p, ship);
|
||||
blockalarm();
|
||||
@ -206,9 +206,9 @@ char flag;
|
||||
sgetstr(pr, buf, n)
|
||||
char *pr;
|
||||
char *buf;
|
||||
n;
|
||||
int n;
|
||||
{
|
||||
c;
|
||||
int c;
|
||||
char *p = buf;
|
||||
|
||||
prompt(pr, (struct ship *)0);
|
||||
|
@ -141,7 +141,7 @@ Write(type, ship, isstr, a, b, c, d)
|
||||
Sync()
|
||||
{
|
||||
sig_t sighup, sigint;
|
||||
n;
|
||||
int n;
|
||||
int type, shipnum, isstr, a, b, c, d;
|
||||
char buf[80];
|
||||
char erred = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user