summaryrefslogtreecommitdiffstats
path: root/sail/pl_7.c
diff options
context:
space:
mode:
Diffstat (limited to 'sail/pl_7.c')
-rw-r--r--sail/pl_7.c299
1 files changed, 133 insertions, 166 deletions
diff --git a/sail/pl_7.c b/sail/pl_7.c
index 1679b10b..b876edca 100644
--- a/sail/pl_7.c
+++ b/sail/pl_7.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pl_7.c,v 1.15 2000/07/03 03:57:44 matt Exp $ */
+/* $NetBSD: pl_7.c,v 1.16 2001/01/01 21:57:38 jwise Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)pl_7.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: pl_7.c,v 1.15 2000/07/03 03:57:44 matt Exp $");
+__RCSID("$NetBSD: pl_7.c,v 1.16 2001/01/01 21:57:38 jwise Exp $");
#endif
#endif /* not lint */
@@ -79,7 +79,7 @@ struct File *mf; /* ms->file */
struct shipspecs *mc; /* ms->specs */
void
-initscreen()
+initscreen(void)
{
if (!SCREENTEST()) {
printf("Can't sail on this terminal.\n");
@@ -92,21 +92,21 @@ initscreen()
stat_w = newwin(STAT_Y, STAT_X, STAT_T, STAT_L);
turn_w = newwin(TURN_Y, TURN_X, TURN_T, TURN_L);
done_curses++;
- (void) leaveok(view_w, 1);
- (void) leaveok(slot_w, 1);
- (void) leaveok(stat_w, 1);
- (void) leaveok(turn_w, 1);
+ leaveok(view_w, 1);
+ leaveok(slot_w, 1);
+ leaveok(stat_w, 1);
+ leaveok(turn_w, 1);
noecho();
crmode();
}
void
-cleanupscreen()
+cleanupscreen(void)
{
/* alarm already turned off */
if (done_curses) {
- (void) wmove(scroll_w, SCROLL_Y - 1, 0);
- (void) wclrtoeol(scroll_w);
+ wmove(scroll_w, SCROLL_Y - 1, 0);
+ wclrtoeol(scroll_w);
draw_screen();
endwin();
}
@@ -114,13 +114,12 @@ cleanupscreen()
/*ARGSUSED*/
void
-newturn(n)
- int n __attribute__((__unused__));
+newturn(int n __attribute__((__unused__)))
{
repaired = loaded = fired = changed = 0;
movebuf[0] = '\0';
- (void) alarm(0);
+ alarm(0);
if (mf->readyL & R_LOADING) {
if (mf->readyL & R_DOUBLE)
mf->readyL = R_LOADING;
@@ -137,15 +136,15 @@ newturn(n)
Write(W_DDEAD, SHIP(0), 0, 0, 0, 0);
if (sc_hasprompt) {
- (void) wmove(scroll_w, sc_line, 0);
- (void) wclrtoeol(scroll_w);
+ wmove(scroll_w, sc_line, 0);
+ wclrtoeol(scroll_w);
}
if (Sync() < 0)
leave(LEAVE_SYNC);
if (!hasdriver)
leave(LEAVE_DRIVER);
if (sc_hasprompt)
- (void) wprintw(scroll_w, "%s%s", sc_prompt, sc_buf);
+ wprintw(scroll_w, "%s%s", sc_prompt, sc_buf);
if (turn % 50 == 0)
Write(W_ALIVE, SHIP(0), 0, 0, 0, 0);
@@ -164,76 +163,51 @@ newturn(n)
adjustview();
draw_screen();
- (void) signal(SIGALRM, newturn);
- (void) alarm(7);
+ signal(SIGALRM, newturn);
+ alarm(7);
}
/*VARARGS2*/
void
-#ifdef __STDC__
Signal(const char *fmt, struct ship *ship, ...)
-#else
-Signal(va_alist)
- va_dcl
-#endif
{
va_list ap;
char format[BUFSIZ];
-#ifndef __STDC__
- const char *fmt;
- struct ship *ship;
- va_start(ap);
- fmt = va_arg(ap, const char *);
- ship = va_arg(ap, struct ship *);
-#else
va_start(ap, ship);
-#endif
if (!done_curses)
return;
if (*fmt == '\7')
putchar(*fmt++);
fmtship(format, sizeof(format), fmt, ship);
- (void) vwprintw(scroll_w, format, ap);
+ vwprintw(scroll_w, format, ap);
va_end(ap);
Scroll();
}
/*VARARGS2*/
void
-#ifdef __STDC__
Msg(const char *fmt, ...)
-#else
-Msg(va_alist)
- va_dcl
-#endif
{
va_list ap;
-#ifndef __STDC__
- const char *fmt;
- va_start(ap);
- fmt = va_arg(ap, const char *);
-#else
va_start(ap, fmt);
-#endif
-
if (!done_curses)
return;
if (*fmt == '\7')
putchar(*fmt++);
- (void) vwprintw(scroll_w, fmt, ap);
+ vwprintw(scroll_w, fmt, ap);
va_end(ap);
Scroll();
}
void
-Scroll()
+Scroll(void)
{
if (++sc_line >= SCROLL_Y)
sc_line = 0;
- (void) wmove(scroll_w, sc_line, 0);
- (void) wclrtoeol(scroll_w);
+ wmove(scroll_w, sc_line, 0);
+ wclrtoeol(scroll_w);
}
void
@@ -247,12 +221,11 @@ prompt(p, ship)
sc_prompt = buf;
sc_buf = "";
sc_hasprompt = 1;
- (void) waddstr(scroll_w, buf);
+ waddstr(scroll_w, buf);
}
void
-endprompt(flag)
-char flag;
+endprompt(int flag)
{
sc_hasprompt = 0;
if (flag)
@@ -260,29 +233,23 @@ char flag;
}
int
-sgetch(p, ship, flag)
- const char *p;
- struct ship *ship;
- char flag;
+sgetch(const char *p, struct ship *ship, int flag)
{
int c;
prompt(p, ship);
blockalarm();
- (void) wrefresh(scroll_w);
+ wrefresh(scroll_w);
unblockalarm();
while ((c = wgetch(scroll_w)) == EOF)
;
if (flag && c >= ' ' && c < 0x7f)
- (void) waddch(scroll_w, c);
+ waddch(scroll_w, c);
endprompt(flag);
return c;
}
void
-sgetstr(pr, buf, n)
- const char *pr;
- char *buf;
- int n;
+sgetstr(const char *pr, char *buf, int n)
{
int c;
char *p = buf;
@@ -292,7 +259,7 @@ sgetstr(pr, buf, n)
for (;;) {
*p = 0;
blockalarm();
- (void) wrefresh(scroll_w);
+ wrefresh(scroll_w);
unblockalarm();
while ((c = wgetch(scroll_w)) == EOF)
;
@@ -303,248 +270,248 @@ sgetstr(pr, buf, n)
return;
case '\b':
if (p > buf) {
- (void) waddstr(scroll_w, "\b \b");
+ waddstr(scroll_w, "\b \b");
p--;
}
break;
default:
if (c >= ' ' && c < 0x7f && p < buf + n - 1) {
*p++ = c;
- (void) waddch(scroll_w, c);
+ waddch(scroll_w, c);
} else
- (void) putchar('\a');
+ putchar('\a');
}
}
}
void
-draw_screen()
+draw_screen(void)
{
draw_view();
draw_turn();
draw_stat();
draw_slot();
- (void) wrefresh(scroll_w); /* move the cursor */
+ wrefresh(scroll_w); /* move the cursor */
}
void
-draw_view()
+draw_view(void)
{
struct ship *sp;
- (void) werase(view_w);
+ werase(view_w);
foreachship(sp) {
if (sp->file->dir
&& sp->file->row > viewrow
&& sp->file->row < viewrow + VIEW_Y
&& sp->file->col > viewcol
&& sp->file->col < viewcol + VIEW_X) {
- (void) wmove(view_w, sp->file->row - viewrow,
+ wmove(view_w, sp->file->row - viewrow,
sp->file->col - viewcol);
- (void) waddch(view_w, colours(sp));
- (void) wmove(view_w,
+ waddch(view_w, colours(sp));
+ wmove(view_w,
sternrow(sp) - viewrow,
sterncol(sp) - viewcol);
- (void) waddch(view_w, sterncolour(sp));
+ waddch(view_w, sterncolour(sp));
}
}
- (void) wrefresh(view_w);
+ wrefresh(view_w);
}
void
-draw_turn()
+draw_turn(void)
{
- (void) wmove(turn_w, 0, 0);
- (void) wprintw(turn_w, "%cTurn %d", dont_adjust?'*':'-', turn);
- (void) wrefresh(turn_w);
+ wmove(turn_w, 0, 0);
+ wprintw(turn_w, "%cTurn %d", dont_adjust?'*':'-', turn);
+ wrefresh(turn_w);
}
void
-draw_stat()
+draw_stat(void)
{
- (void) wmove(stat_w, STAT_1, 0);
- (void) wprintw(stat_w, "Points %3d\n", mf->points);
- (void) wprintw(stat_w, "Fouls %2d\n", fouled(ms));
- (void) wprintw(stat_w, "Grapples %2d\n", grappled(ms));
+ wmove(stat_w, STAT_1, 0);
+ wprintw(stat_w, "Points %3d\n", mf->points);
+ wprintw(stat_w, "Fouls %2d\n", fouled(ms));
+ wprintw(stat_w, "Grapples %2d\n", grappled(ms));
- (void) wmove(stat_w, STAT_2, 0);
- (void) wprintw(stat_w, " 0 %c(%c)\n",
+ wmove(stat_w, STAT_2, 0);
+ wprintw(stat_w, " 0 %c(%c)\n",
maxmove(ms, winddir + 3, -1) + '0',
maxmove(ms, winddir + 3, 1) + '0');
- (void) waddstr(stat_w, " \\|/\n");
- (void) wprintw(stat_w, " -^-%c(%c)\n",
+ waddstr(stat_w, " \\|/\n");
+ wprintw(stat_w, " -^-%c(%c)\n",
maxmove(ms, winddir + 2, -1) + '0',
maxmove(ms, winddir + 2, 1) + '0');
- (void) waddstr(stat_w, " /|\\\n");
- (void) wprintw(stat_w, " | %c(%c)\n",
+ waddstr(stat_w, " /|\\\n");
+ wprintw(stat_w, " | %c(%c)\n",
maxmove(ms, winddir + 1, -1) + '0',
maxmove(ms, winddir + 1, 1) + '0');
- (void) wprintw(stat_w, " %c(%c)\n",
+ wprintw(stat_w, " %c(%c)\n",
maxmove(ms, winddir, -1) + '0',
maxmove(ms, winddir, 1) + '0');
- (void) wmove(stat_w, STAT_3, 0);
- (void) wprintw(stat_w, "Load %c%c %c%c\n",
+ wmove(stat_w, STAT_3, 0);
+ wprintw(stat_w, "Load %c%c %c%c\n",
loadname[mf->loadL], readyname(mf->readyL),
loadname[mf->loadR], readyname(mf->readyR));
- (void) wprintw(stat_w, "Hull %2d\n", mc->hull);
- (void) wprintw(stat_w, "Crew %2d %2d %2d\n",
+ wprintw(stat_w, "Hull %2d\n", mc->hull);
+ wprintw(stat_w, "Crew %2d %2d %2d\n",
mc->crew1, mc->crew2, mc->crew3);
- (void) wprintw(stat_w, "Guns %2d %2d\n", mc->gunL, mc->gunR);
- (void) wprintw(stat_w, "Carr %2d %2d\n", mc->carL, mc->carR);
- (void) wprintw(stat_w, "Rigg %d %d %d ", mc->rig1, mc->rig2, mc->rig3);
+ wprintw(stat_w, "Guns %2d %2d\n", mc->gunL, mc->gunR);
+ wprintw(stat_w, "Carr %2d %2d\n", mc->carL, mc->carR);
+ wprintw(stat_w, "Rigg %d %d %d ", mc->rig1, mc->rig2, mc->rig3);
if (mc->rig4 < 0)
- (void) waddch(stat_w, '-');
+ waddch(stat_w, '-');
else
- (void) wprintw(stat_w, "%d", mc->rig4);
- (void) wrefresh(stat_w);
+ wprintw(stat_w, "%d", mc->rig4);
+ wrefresh(stat_w);
}
void
-draw_slot()
+draw_slot(void)
{
if (!boarding(ms, 0)) {
- (void) mvwaddstr(slot_w, 0, 0, " ");
- (void) mvwaddstr(slot_w, 1, 0, " ");
+ mvwaddstr(slot_w, 0, 0, " ");
+ mvwaddstr(slot_w, 1, 0, " ");
} else
- (void) mvwaddstr(slot_w, 1, 0, "OBP");
+ mvwaddstr(slot_w, 1, 0, "OBP");
if (!boarding(ms, 1)) {
- (void) mvwaddstr(slot_w, 2, 0, " ");
- (void) mvwaddstr(slot_w, 3, 0, " ");
+ mvwaddstr(slot_w, 2, 0, " ");
+ mvwaddstr(slot_w, 3, 0, " ");
} else
- (void) mvwaddstr(slot_w, 3, 0, "DBP");
+ mvwaddstr(slot_w, 3, 0, "DBP");
- (void) wmove(slot_w, SLOT_Y-4, 0);
+ wmove(slot_w, SLOT_Y-4, 0);
if (mf->RH)
- (void) wprintw(slot_w, "%dRH", mf->RH);
+ wprintw(slot_w, "%dRH", mf->RH);
else
- (void) waddstr(slot_w, " ");
- (void) wmove(slot_w, SLOT_Y-3, 0);
+ waddstr(slot_w, " ");
+ wmove(slot_w, SLOT_Y-3, 0);
if (mf->RG)
- (void) wprintw(slot_w, "%dRG", mf->RG);
+ wprintw(slot_w, "%dRG", mf->RG);
else
- (void) waddstr(slot_w, " ");
- (void) wmove(slot_w, SLOT_Y-2, 0);
+ waddstr(slot_w, " ");
+ wmove(slot_w, SLOT_Y-2, 0);
if (mf->RR)
- (void) wprintw(slot_w, "%dRR", mf->RR);
+ wprintw(slot_w, "%dRR", mf->RR);
else
- (void) waddstr(slot_w, " ");
+ waddstr(slot_w, " ");
#define Y (SLOT_Y/2)
- (void) wmove(slot_w, 7, 1);
- (void) wprintw(slot_w,"%d", windspeed);
- (void) mvwaddch(slot_w, Y, 0, ' ');
- (void) mvwaddch(slot_w, Y, 2, ' ');
- (void) mvwaddch(slot_w, Y-1, 0, ' ');
- (void) mvwaddch(slot_w, Y-1, 1, ' ');
- (void) mvwaddch(slot_w, Y-1, 2, ' ');
- (void) mvwaddch(slot_w, Y+1, 0, ' ');
- (void) mvwaddch(slot_w, Y+1, 1, ' ');
- (void) mvwaddch(slot_w, Y+1, 2, ' ');
- (void) wmove(slot_w, Y - dr[winddir], 1 - dc[winddir]);
+ wmove(slot_w, 7, 1);
+ wprintw(slot_w,"%d", windspeed);
+ mvwaddch(slot_w, Y, 0, ' ');
+ mvwaddch(slot_w, Y, 2, ' ');
+ mvwaddch(slot_w, Y-1, 0, ' ');
+ mvwaddch(slot_w, Y-1, 1, ' ');
+ mvwaddch(slot_w, Y-1, 2, ' ');
+ mvwaddch(slot_w, Y+1, 0, ' ');
+ mvwaddch(slot_w, Y+1, 1, ' ');
+ mvwaddch(slot_w, Y+1, 2, ' ');
+ wmove(slot_w, Y - dr[winddir], 1 - dc[winddir]);
switch (winddir) {
case 1:
case 5:
- (void) waddch(slot_w, '|');
+ waddch(slot_w, '|');
break;
case 2:
case 6:
- (void) waddch(slot_w, '/');
+ waddch(slot_w, '/');
break;
case 3:
case 7:
- (void) waddch(slot_w, '-');
+ waddch(slot_w, '-');
break;
case 4:
case 8:
- (void) waddch(slot_w, '\\');
+ waddch(slot_w, '\\');
break;
}
- (void) mvwaddch(slot_w, Y + dr[winddir], 1 + dc[winddir], '+');
- (void) wrefresh(slot_w);
+ mvwaddch(slot_w, Y + dr[winddir], 1 + dc[winddir], '+');
+ wrefresh(slot_w);
}
void
-draw_board()
+draw_board(void)
{
int n;
- (void) clear();
- (void) werase(view_w);
- (void) werase(slot_w);
- (void) werase(scroll_w);
- (void) werase(stat_w);
- (void) werase(turn_w);
+ clear();
+ werase(view_w);
+ werase(slot_w);
+ werase(scroll_w);
+ werase(stat_w);
+ werase(turn_w);
sc_line = 0;
- (void) move(BOX_T, BOX_L);
+ move(BOX_T, BOX_L);
for (n = 0; n < BOX_X; n++)
- (void) addch('-');
- (void) move(BOX_B, BOX_L);
+ addch('-');
+ move(BOX_B, BOX_L);
for (n = 0; n < BOX_X; n++)
- (void) addch('-');
+ addch('-');
for (n = BOX_T+1; n < BOX_B; n++) {
- (void) mvaddch(n, BOX_L, '|');
- (void) mvaddch(n, BOX_R, '|');
+ mvaddch(n, BOX_L, '|');
+ mvaddch(n, BOX_R, '|');
}
- (void) mvaddch(BOX_T, BOX_L, '+');
- (void) mvaddch(BOX_T, BOX_R, '+');
- (void) mvaddch(BOX_B, BOX_L, '+');
- (void) mvaddch(BOX_B, BOX_R, '+');
- (void) refresh();
+ mvaddch(BOX_T, BOX_L, '+');
+ mvaddch(BOX_T, BOX_R, '+');
+ mvaddch(BOX_B, BOX_L, '+');
+ mvaddch(BOX_B, BOX_R, '+');
+ refresh();
#define WSaIM "Wooden Ships & Iron Men"
- (void) wmove(view_w, 2, (VIEW_X - sizeof WSaIM - 1) / 2);
- (void) waddstr(view_w, WSaIM);
- (void) wmove(view_w, 4, (VIEW_X - strlen(cc->name)) / 2);
- (void) waddstr(view_w, cc->name);
- (void) wrefresh(view_w);
-
- (void) move(LINE_T, LINE_L);
- (void) printw("Class %d %s (%d guns) '%s' (%c%c)",
+ wmove(view_w, 2, (VIEW_X - sizeof WSaIM - 1) / 2);
+ waddstr(view_w, WSaIM);
+ wmove(view_w, 4, (VIEW_X - strlen(cc->name)) / 2);
+ waddstr(view_w, cc->name);
+ wrefresh(view_w);
+
+ move(LINE_T, LINE_L);
+ printw("Class %d %s (%d guns) '%s' (%c%c)",
mc->class,
classname[mc->class],
mc->guns,
ms->shipname,
colours(ms),
sterncolour(ms));
- (void) refresh();
+ refresh();
}
void
-centerview()
+centerview(void)
{
viewrow = mf->row - VIEW_Y / 2;
viewcol = mf->col - VIEW_X / 2;
}
void
-upview()
+upview(void)
{
viewrow -= VIEW_Y / 3;
}
void
-downview()
+downview(void)
{
viewrow += VIEW_Y / 3;
}
void
-leftview()
+leftview(void)
{
viewcol -= VIEW_X / 5;
}
void
-rightview()
+rightview(void)
{
viewcol += VIEW_X / 5;
}
void
-adjustview()
+adjustview(void)
{
if (dont_adjust)
return;