DragonFly submit List (threaded) for 2005-03
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
[
Date Index][
Thread Index]
src/games WARNS 6 cleanups
Here are patches that cleanup
bs
worm
worms
wump
grdc
to WARNS 6 levels. All are small except bs which was almost totally
redone. There are still more cleanups to do to these, but it's a
start.
-Craig
--
-----------------------------------------------------------------------
Craig Dooley <xlnxminusx@xxxxxxxxx>
Index: games/bs/Makefile
===================================================================
RCS file: /home/dcvs/src/games/bs/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- games/bs/Makefile 17 Jun 2003 04:25:23 -0000 1.2
+++ games/bs/Makefile 15 Mar 2005 13:53:04 -0000
@@ -6,5 +6,6 @@
DPADD= ${LIBNCURSES} ${LIBMYTINFO}
LDADD= -lncurses -lmytinfo
HIDEGAME=hidegame
+WARNS?= 6
.include <bsd.prog.mk>
Index: games/bs/bs.c
===================================================================
RCS file: /home/dcvs/src/games/bs/bs.c,v
retrieving revision 1.4
diff -u -r1.4 bs.c
--- games/bs/bs.c 12 Nov 2003 14:53:52 -0000 1.4
+++ games/bs/bs.c 15 Mar 2005 13:50:46 -0000
@@ -60,14 +60,14 @@
#define PXBASE 3
#define PY(y) (PYBASE + (y))
#define PX(x) (PXBASE + (x)*3)
-#define pgoto(y, x) (void)move(PY(y), PX(x))
+#define pgoto(y, x) move(PY(y), PX(x))
/* how to position us on cpu board */
#define CYBASE 3
#define CXBASE 48
#define CY(y) (CYBASE + (y))
#define CX(x) (CXBASE + (x)*3)
-#define cgoto(y, x) (void)move(CY(y), CX(x))
+#define cgoto(y, x) move(CY(y), CX(x))
#define ONBOARD(x, y) (x >= 0 && x < BWIDTH && y >= 0 && y < BDEPTH)
@@ -102,34 +102,33 @@
static int curx = (BWIDTH / 2);
static int cury = (BDEPTH / 2);
-typedef struct
-{
- char *name; /* name of the ship type */
- unsigned int hits; /* how many times has this ship been hit? */
- char symbol; /* symbol for game purposes */
- char length; /* length of ship */
- char x, y; /* coordinates of ship start point */
- enum directions dir;/* direction of `bow' */
- bool placed; /* has it been placed on the board? */
+typedef struct {
+ char *name; /* name of the ship type */
+ char hits; /* how many times has this ship been hit? */
+ char symbol; /* symbol for game purposes */
+ char length; /* length of ship */
+ char x, y; /* coordinates of ship start point */
+ enum directions dir; /* direction of `bow' */
+ bool placed; /* has it been placed on the board? */
}
ship_t;
ship_t plyship[SHIPTYPES] =
{
- { carrier, 0, 'A', 5},
- { battle, 0, 'B', 4},
- { destroy, 0, 'D', 3},
- { sub, 0, 'S', 3},
- { ptboat, 0, 'P', 2},
+ { carrier, 0, 'A', 5, 0, 0, E, FALSE},
+ { battle, 0, 'B', 4, 0, 0, E, FALSE},
+ { destroy, 0, 'D', 3, 0, 0, E, FALSE},
+ { sub, 0, 'S', 3, 0, 0, E, FALSE},
+ { ptboat, 0, 'P', 2, 0, 0, E, FALSE},
};
ship_t cpuship[SHIPTYPES] =
{
- { carrier, 0, 'A', 5},
- { battle, 0, 'B', 4},
- { destroy, 0, 'D', 3},
- { sub, 0, 'S', 3},
- { ptboat, 0, 'P', 2},
+ { carrier, 0, 'A', 5, 0, 0, E, FALSE},
+ { battle, 0, 'B', 4, 0, 0, E, FALSE},
+ { destroy, 0, 'D', 3, 0, 0, E, FALSE},
+ { sub, 0, 'S', 3, 0, 0, E, FALSE},
+ { ptboat, 0, 'P', 2, 0, 0, E, FALSE},
};
/* "Hits" board, and main board. */
@@ -140,82 +139,79 @@
static int salvo, blitz, closepack;
-#define PR (void)addstr
+#define PR addstr
static bool checkplace (int, ship_t *, int);
static int getcoord (int);
int playagain (void);
-static void uninitgame(sig)
/* end the game, either normally or due to signal */
-int sig;
-{
+static void uninitgame(void) {
clear();
- (void)refresh();
- (void)resetterm();
- (void)echo();
- (void)endwin();
+ refresh();
+ resetterm();
+ echo();
+ endwin();
exit(0);
}
-static void announceopts()
+static void sighandler(__unused int sig) {
+ uninitgame();
+}
+
/* announce which game options are enabled */
-{
- if (salvo || blitz || closepack)
- {
- (void) printw("Playing optional game (");
+static void announceopts(void) {
+ printw("Playing %s game (", (salvo || blitz || closepack) ?
+ "optional" : "standard");
+
if (salvo)
- (void) printw("salvo, ");
+ printw("salvo, ");
else
- (void) printw("nosalvo, ");
+ printw("nosalvo, ");
+
if (blitz)
- (void) printw("blitz ");
+ printw("blitz, ");
else
- (void) printw("noblitz, ");
+ printw("noblitz, ");
+
if (closepack)
- (void) printw("closepack)");
+ printw("closepack)");
else
- (void) printw("noclosepack)");
- }
- else
- (void) printw(
- "Playing standard game (noblitz, nosalvo, noclosepack)");
+ printw("noclosepack)");
}
-static void intro()
-{
+static void intro(void) {
char *tmpname;
srandomdev();
tmpname = getlogin();
- (void) signal(SIGINT,uninitgame);
- (void) signal(SIGINT,uninitgame);
- (void) signal(SIGIOT,uninitgame); /* for assert(3) */
+ signal(SIGINT,sighandler);
+ signal(SIGINT,sighandler);
+ signal(SIGIOT,sighandler); /* for assert(3) */
if(signal(SIGQUIT,SIG_IGN) != SIG_IGN)
- (void)signal(SIGQUIT,uninitgame);
+ signal(SIGQUIT,sighandler);
- if(tmpname != '\0')
- {
- (void)strcpy(name,tmpname);
- name[0] = toupper(name[0]);
- }
- else
- (void)strcpy(name,dftname);
+ if(tmpname != '\0') {
+ strcpy(name,tmpname);
+ name[0] = toupper(name[0]);
+ } else {
+ strcpy(name,dftname);
+ }
- (void)initscr();
+ initscr();
#ifdef KEY_MIN
keypad(stdscr, TRUE);
#endif /* KEY_MIN */
- (void)saveterm();
- (void)nonl();
- (void)cbreak();
- (void)noecho();
+ saveterm();
+ nonl();
+ cbreak();
+ noecho();
#ifdef PENGUIN
- (void)clear();
- (void)mvaddstr(4,29,"Welcome to Battleship!");
- (void)move(8,0);
+ clear();
+ mvaddstr(4,29,"Welcome to Battleship!");
+ move(8,0);
PR(" \\\n");
PR(" \\ \\ \\\n");
PR(" \\ \\ \\ \\ \\_____________\n");
@@ -227,8 +223,8 @@
PR(" \\ /\n");
PR(" \\___________________________________________________/\n");
- (void) mvaddstr(22,27,"Hit any key to continue..."); (void)refresh();
- (void) getch();
+ mvaddstr(22,27,"Hit any key to continue..."); refresh();
+ getch();
#endif /* PENGUIN */
#ifdef A_COLOR
@@ -246,154 +242,139 @@
}
-/* VARARGS1 */
-static void prompt(n, f, s)
/* print a message at the prompt line */
-int n;
-char *f, *s;
-{
- (void) move(PROMPTLINE + n, 0);
- (void) clrtoeol();
- (void) printw(f, s);
- (void) refresh();
+static void prompt(int n, const char *f, ...) {
+ va_list ap;
+ char buf[COLWIDTH + 1];
+
+ va_start(ap, f);
+ move(PROMPTLINE + n, 0);
+ clrtoeol();
+ vsnprintf(buf, COLWIDTH + 1, f, ap);
+ printw("%s", buf);
+ refresh();
+ va_end(ap);
}
-static void error(s)
-char *s;
-{
- (void) move(PROMPTLINE + 2, 0);
- (void) clrtoeol();
- if (s)
- {
- (void) addstr(s);
- (void) beep();
+static void error(const char *s) {
+ move(PROMPTLINE + 2, 0);
+ clrtoeol();
+ if (s) {
+ addstr(s);
+ beep();
}
}
-static void placeship(b, ss, vis)
-int b;
-ship_t *ss;
-int vis;
-{
+static void placeship(int b, ship_t *ss, int vis) {
int l;
- for(l = 0; l < ss->length; ++l)
- {
- int newx = ss->x + l * xincr[ss->dir];
- int newy = ss->y + l * yincr[ss->dir];
-
- board[b][newx][newy] = ss->symbol;
- if (vis)
- {
- pgoto(newy, newx);
- (void) addch((chtype)ss->symbol);
- }
+ for(l = 0; l < ss->length; ++l) {
+ int newx = ss->x + l * xincr[ss->dir];
+ int newy = ss->y + l * yincr[ss->dir];
+
+ board[b][newx][newy] = ss->symbol;
+ if (vis) {
+ pgoto(newy, newx);
+ addch((chtype)ss->symbol);
+ }
}
ss->hits = 0;
}
-static int rnd(n)
-int n;
-{
+static int rnd(int n) {
return(random() % n);
}
-static void randomplace(b, ss)
/* generate a valid random ship placement into px,py */
-int b;
-ship_t *ss;
-{
+static void randomplace(int b, ship_t *ss) {
int bwidth = BWIDTH - ss->length;
int bdepth = BDEPTH - ss->length;
do {
- ss->y = rnd(bdepth);
- ss->x = rnd(bwidth);
- ss->dir = rnd(2) ? E : S;
- } while
- (!checkplace(b, ss, FALSE));
+ ss->y = rnd(bdepth);
+ ss->x = rnd(bwidth);
+ ss->dir = rnd(2) ? E : S;
+ } while (!checkplace(b, ss, FALSE));
}
-static void initgame()
-{
+static void initgame(void) {
int i, j, unplaced;
ship_t *ss;
- (void) clear();
- (void) mvaddstr(0,35,"BATTLESHIPS");
- (void) move(PROMPTLINE + 2, 0);
+ clear();
+ mvaddstr(0,35,"BATTLESHIPS");
+ move(PROMPTLINE + 2, 0);
announceopts();
bzero(board, sizeof(char) * BWIDTH * BDEPTH * 2);
bzero(hits, sizeof(char) * BWIDTH * BDEPTH * 2);
- for (i = 0; i < SHIPTYPES; i++)
- {
- ss = cpuship + i;
- ss->x = ss->y = ss->dir = ss->hits = ss->placed = 0;
- ss = plyship + i;
- ss->x = ss->y = ss->dir = ss->hits = ss->placed = 0;
+ for (i = 0; i < SHIPTYPES; i++) {
+ ss = cpuship + i;
+ ss->x = ss->y = ss->dir = ss->hits = ss->placed = 0;
+ ss = plyship + i;
+ ss->x = ss->y = ss->dir = ss->hits = ss->placed = 0;
}
/* draw empty boards */
- (void) mvaddstr(PYBASE - 2, PXBASE + 5, "Main Board");
- (void) mvaddstr(PYBASE - 1, PXBASE - 3,numbers);
+ mvaddstr(PYBASE - 2, PXBASE + 5, "Main Board");
+ mvaddstr(PYBASE - 1, PXBASE - 3,numbers);
for(i=0; i < BDEPTH; ++i)
{
- (void) mvaddch(PYBASE + i, PXBASE - 3, i + 'A');
+ mvaddch(PYBASE + i, PXBASE - 3, i + 'A');
#ifdef A_COLOR
if (has_colors())
attron(COLOR_PAIR(COLOR_BLUE));
#endif /* A_COLOR */
- (void) addch(' ');
+ addch(' ');
for (j = 0; j < BWIDTH; j++)
- (void) addstr(" . ");
+ addstr(" . ");
#ifdef A_COLOR
attrset(0);
#endif /* A_COLOR */
- (void) addch(' ');
- (void) addch(i + 'A');
+ addch(' ');
+ addch(i + 'A');
}
- (void) mvaddstr(PYBASE + BDEPTH, PXBASE - 3,numbers);
- (void) mvaddstr(CYBASE - 2, CXBASE + 7,"Hit/Miss Board");
- (void) mvaddstr(CYBASE - 1, CXBASE - 3, numbers);
+ mvaddstr(PYBASE + BDEPTH, PXBASE - 3,numbers);
+ mvaddstr(CYBASE - 2, CXBASE + 7,"Hit/Miss Board");
+ mvaddstr(CYBASE - 1, CXBASE - 3, numbers);
for(i=0; i < BDEPTH; ++i)
{
- (void) mvaddch(CYBASE + i, CXBASE - 3, i + 'A');
+ mvaddch(CYBASE + i, CXBASE - 3, i + 'A');
#ifdef A_COLOR
if (has_colors())
attron(COLOR_PAIR(COLOR_BLUE));
#endif /* A_COLOR */
- (void) addch(' ');
+ addch(' ');
for (j = 0; j < BWIDTH; j++)
- (void) addstr(" . ");
+ addstr(" . ");
#ifdef A_COLOR
attrset(0);
#endif /* A_COLOR */
- (void) addch(' ');
- (void) addch(i + 'A');
+ addch(' ');
+ addch(i + 'A');
}
- (void) mvaddstr(CYBASE + BDEPTH,CXBASE - 3,numbers);
+ mvaddstr(CYBASE + BDEPTH,CXBASE - 3,numbers);
- (void) mvprintw(HYBASE, HXBASE,
+ mvprintw(HYBASE, HXBASE,
"To position your ships: move the cursor to a spot, then");
- (void) mvprintw(HYBASE+1,HXBASE,
+ mvprintw(HYBASE+1,HXBASE,
"type the first letter of a ship type to select it, then");
- (void) mvprintw(HYBASE+2,HXBASE,
+ mvprintw(HYBASE+2,HXBASE,
"type a direction ([hjkl] or [4862]), indicating how the");
- (void) mvprintw(HYBASE+3,HXBASE,
+ mvprintw(HYBASE+3,HXBASE,
"ship should be pointed. You may also type a ship letter");
- (void) mvprintw(HYBASE+4,HXBASE,
+ mvprintw(HYBASE+4,HXBASE,
"followed by `r' to position it randomly, or type `R' to");
- (void) mvprintw(HYBASE+5,HXBASE,
+ mvprintw(HYBASE+5,HXBASE,
"place all remaining ships randomly.");
- (void) mvaddstr(MYBASE, MXBASE, "Aiming keys:");
- (void) mvaddstr(SYBASE, SXBASE, "y k u 7 8 9");
- (void) mvaddstr(SYBASE+1, SXBASE, " \\|/ \\|/ ");
- (void) mvaddstr(SYBASE+2, SXBASE, "h-+-l 4-+-6");
- (void) mvaddstr(SYBASE+3, SXBASE, " /|\\ /|\\ ");
- (void) mvaddstr(SYBASE+4, SXBASE, "b j n 1 2 3");
+ mvaddstr(MYBASE, MXBASE, "Aiming keys:");
+ mvaddstr(SYBASE, SXBASE, "y k u 7 8 9");
+ mvaddstr(SYBASE+1, SXBASE, " \\|/ \\|/ ");
+ mvaddstr(SYBASE+2, SXBASE, "h-+-l 4-+-6");
+ mvaddstr(SYBASE+3, SXBASE, " /|\\ /|\\ ");
+ mvaddstr(SYBASE+4, SXBASE, "b j n 1 2 3");
/* have the computer place ships */
for(ss = cpuship; ss < cpuship + SHIPTYPES; ss++)
@@ -421,7 +402,7 @@
(!strchr(docked, c));
if (c == 'R')
- (void) ungetch('R');
+ ungetch('R');
else
{
/* map that into the corresponding symbol */
@@ -440,8 +421,8 @@
if (c == FF)
{
- (void)clearok(stdscr, TRUE);
- (void)refresh();
+ clearok(stdscr, TRUE);
+ refresh();
}
else if (c == 'r')
{
@@ -491,43 +472,41 @@
turn = rnd(2);
- (void) mvprintw(HYBASE, HXBASE,
+ mvprintw(HYBASE, HXBASE,
"To fire, move the cursor to your chosen aiming point ");
- (void) mvprintw(HYBASE+1, HXBASE,
+ mvprintw(HYBASE+1, HXBASE,
"and strike any key other than a motion key. ");
- (void) mvprintw(HYBASE+2, HXBASE,
+ mvprintw(HYBASE+2, HXBASE,
" ");
- (void) mvprintw(HYBASE+3, HXBASE,
+ mvprintw(HYBASE+3, HXBASE,
" ");
- (void) mvprintw(HYBASE+4, HXBASE,
+ mvprintw(HYBASE+4, HXBASE,
" ");
- (void) mvprintw(HYBASE+5, HXBASE,
+ mvprintw(HYBASE+5, HXBASE,
" ");
- (void) prompt(0, "Press any key to start...");
- (void) getch();
+ prompt(0, "Press any key to start...");
+ getch();
}
-static int getcoord(atcpu)
-int atcpu;
-{
+static int getcoord(int atcpu) {
int ny, nx, c;
if (atcpu)
cgoto(cury,curx);
else
pgoto(cury, curx);
- (void)refresh();
+ refresh();
for (;;)
{
if (atcpu)
{
- (void) mvprintw(CYBASE + BDEPTH+1, CXBASE+11, "(%d, %c)", curx, 'A'+cury);
+ mvprintw(CYBASE + BDEPTH+1, CXBASE+11, "(%d, %c)", curx, 'A'+cury);
cgoto(cury, curx);
}
else
{
- (void) mvprintw(PYBASE + BDEPTH+1, PXBASE+11, "(%d, %c)", curx, 'A'+cury);
+ mvprintw(PYBASE + BDEPTH+1, PXBASE+11, "(%d, %c)", curx, 'A'+cury);
pgoto(cury, curx);
}
@@ -583,14 +562,14 @@
break;
case FF:
nx = curx; ny = cury;
- (void)clearok(stdscr, TRUE);
- (void)refresh();
+ clearok(stdscr, TRUE);
+ refresh();
break;
default:
if (atcpu)
- (void) mvaddstr(CYBASE + BDEPTH + 1, CXBASE + 11, " ");
+ mvaddstr(CYBASE + BDEPTH + 1, CXBASE + 11, " ");
else
- (void) mvaddstr(PYBASE + BDEPTH + 1, PXBASE + 11, " ");
+ mvaddstr(PYBASE + BDEPTH + 1, PXBASE + 11, " ");
return(c);
}
@@ -599,87 +578,76 @@
}
}
-static int collidecheck(b, y, x)
/* is this location on the selected zboard adjacent to a ship? */
-int b;
-int y, x;
-{
+static int collidecheck(int b, int y, int x) {
int collide;
/* anything on the square */
if ((collide = IS_SHIP(board[b][x][y])) != 0)
- return(collide);
+ return(collide);
/* anything on the neighbors */
- if (!closepack)
- {
- int i;
+ if (!closepack) {
+ int i;
- for (i = 0; i < 8; i++)
- {
- int xend, yend;
+ for (i = 0; i < 8; i++) {
+ int xend, yend;
+
+ yend = y + yincr[i];
+ xend = x + xincr[i];
+ if (ONBOARD(xend, yend))
+ collide += IS_SHIP(board[b][xend][yend]);
+ }
+ }
- yend = y + yincr[i];
- xend = x + xincr[i];
- if (ONBOARD(xend, yend))
- collide += IS_SHIP(board[b][xend][yend]);
- }
- }
return(collide);
}
-static bool checkplace(b, ss, vis)
-int b;
-ship_t *ss;
-int vis;
-{
+static bool checkplace(int b, ship_t *ss, int vis) {
int l, xend, yend;
/* first, check for board edges */
xend = ss->x + ss->length * xincr[ss->dir];
yend = ss->y + ss->length * yincr[ss->dir];
- if (!ONBOARD(xend, yend))
- {
- if (vis)
- switch(rnd(3))
- {
- case 0:
- error("Ship is hanging from the edge of the world");
- break;
- case 1:
- error("Try fitting it on the board");
- break;
- case 2:
- error("Figure I won't find it if you put it there?");
- break;
+ if (!ONBOARD(xend, yend)) {
+ if (vis) {
+ switch(rnd(3)) {
+ case 0:
+ error("Ship is hanging from the edge of the world");
+ break;
+ case 1:
+ error("Try fitting it on the board");
+ break;
+ case 2:
+ error("Figure I won't find it if you put it there?");
+ break;
+ }
}
- return(0);
+ return(0);
}
- for(l = 0; l < ss->length; ++l)
- {
- if(collidecheck(b, ss->y+l*yincr[ss->dir], ss->x+l*xincr[ss->dir]))
- {
- if (vis)
- switch(rnd(3))
- {
- case 0:
- error("There's already a ship there");
- break;
- case 1:
- error("Collision alert! Aaaaaagh!");
- break;
- case 2:
- error("Er, Admiral, what about the other ship?");
- break;
- }
- return(FALSE);
+ for(l = 0; l < ss->length; ++l) {
+ if(collidecheck(b, ss->y+l*yincr[ss->dir], ss->x+l*xincr[ss->dir])) {
+ if (vis) {
+ switch(rnd(3)) {
+ case 0:
+ error("There's already a ship there");
+ break;
+ case 1:
+ error("Collision alert! Aaaaaagh!");
+ break;
+ case 2:
+ error("Er, Admiral, what about the other ship?");
+ break;
+ }
+ }
+ return(FALSE);
}
}
return(TRUE);
}
-static int awinna()
+static int awinna(void)
{
int i, j;
ship_t *ss;
@@ -696,10 +664,8 @@
return(-1);
}
-static ship_t *hitship(x, y)
/* a hit on the targeted ship */
-int x, y;
-{
+static ship_t *hitship(int x, int y) {
ship_t *sb, *ss;
char sym;
int oldx, oldy;
@@ -711,75 +677,71 @@
for(ss = sb; ss < sb + SHIPTYPES; ++ss)
if(ss->symbol == sym)
{
- if (++ss->hits < ss->length) /* still afloat? */
- return((ship_t *)NULL);
- else /* sunk! */
- {
+ if (++ss->hits < ss->length) { /* still afloat? */
+ return((ship_t *)NULL);
+ } else { /* sunk */
int i, j;
- if (!closepack)
- for (j = -1; j <= 1; j++)
- {
- int bx = ss->x + j * xincr[(ss->dir + 2) % 8];
- int by = ss->y + j * yincr[(ss->dir + 2) % 8];
-
- for (i = -1; i <= ss->length; ++i)
- {
- int x, y;
-
- x = bx + i * xincr[ss->dir];
- y = by + i * yincr[ss->dir];
- if (ONBOARD(x, y))
- {
- hits[turn][x][y] = MARK_MISS;
- if (turn % 2 == PLAYER)
- {
- cgoto(y, x);
+ if (!closepack) {
+ for (j = -1; j <= 1; j++) {
+ int bx = ss->x + j * xincr[(ss->dir + 2) % 8];
+ int by = ss->y + j * yincr[(ss->dir + 2) % 8];
+
+ for (i = -1; i <= ss->length; ++i) {
+ int cx, cy;
+
+ cx = bx + i * xincr[ss->dir];
+ cy = by + i * yincr[ss->dir];
+ if (ONBOARD(cx, cy)) {
+ hits[turn][cx][cy] = MARK_MISS;
+ if (turn % 2 == PLAYER) {
+ cgoto(cy, cx);
#ifdef A_COLOR
- if (has_colors())
- attron(COLOR_PAIR(COLOR_GREEN));
+ if (has_colors())
+ attron(COLOR_PAIR(COLOR_GREEN));
#endif /* A_COLOR */
- (void)addch(MARK_MISS);
+
+ addch(MARK_MISS);
#ifdef A_COLOR
- attrset(0);
+ attrset(0);
#endif /* A_COLOR */
+ }
+ }
}
- }
- }
- }
+ }
+ }
for (i = 0; i < ss->length; ++i)
{
- int x = ss->x + i * xincr[ss->dir];
- int y = ss->y + i * yincr[ss->dir];
+ int dx = ss->x + i * xincr[ss->dir];
+ int dy = ss->y + i * yincr[ss->dir];
- hits[turn][x][y] = ss->symbol;
+ hits[turn][dx][dy] = ss->symbol;
if (turn % 2 == PLAYER)
{
- cgoto(y, x);
- (void) addch(ss->symbol);
+ cgoto(dy, dx);
+ addch(ss->symbol);
}
}
- (void) move(oldy, oldx);
+ move(oldy, oldx);
return(ss);
}
}
- (void) move(oldy, oldx);
+ move(oldy, oldx);
return((ship_t *)NULL);
}
-static int plyturn()
-{
+static int plyturn(void) {
ship_t *ss;
bool hit;
- char *m;
+ char const *m;
m = NULL;
prompt(1, "Where do you want to shoot? ");
for (;;)
{
- (void) getcoord(COMPUTER);
+ getcoord(COMPUTER);
if (hits[PLAYER][curx][cury])
{
prompt(1, "You shelled this spot already! Try again.");
@@ -799,7 +761,7 @@
attron(COLOR_PAIR(COLOR_GREEN));
}
#endif /* A_COLOR */
- (void) addch((chtype)hits[PLAYER][curx][cury]);
+ addch((chtype)hits[PLAYER][curx][cury]);
#ifdef A_COLOR
attrset(0);
#endif /* A_COLOR */
@@ -825,43 +787,39 @@
m = " You'll pick up survivors from my %s, I hope...!";
break;
}
- (void)printw(m, ss->name);
- (void)beep();
+ printw(m, ss->name);
+ beep();
return(awinna() == -1);
}
return(hit);
}
-static int sgetc(s)
-char *s;
-{
- char *s1;
+static int sgetc(const char *s) {
+ const char *s1;
int ch;
- (void)refresh();
- for(;;)
- {
- ch = getch();
- if (islower(ch))
- ch = toupper(ch);
- if (ch == CTRLC)
- uninitgame();
- for (s1=s; *s1 && ch != *s1; ++s1)
- continue;
- if (*s1)
- {
- (void) addch((chtype)ch);
- (void)refresh();
- return(ch);
- }
+ refresh();
+ for(;;) {
+ ch = getch();
+ if (islower(ch))
+ ch = toupper(ch);
+
+ if (ch == CTRLC)
+ uninitgame();
+
+ for (s1=s; *s1 && ch != *s1; ++s1)
+ continue;
+
+ if (*s1) {
+ addch((chtype)ch);
+ refresh();
+ return(ch);
+ }
}
}
-
-static void randomfire(px, py)
/* random-fire routine -- implements simple diagonal-striping strategy */
-int *px, *py;
-{
+static void randomfire(int *px, int *py) {
static int turncount = 0;
static int srchstep = BEGINSTEP;
static int huntoffs; /* Offset on search strategy */
@@ -918,22 +876,20 @@
#define S_HIT 1
#define S_SUNK -1
-static bool cpufire(x, y)
/* fire away at given location */
-int x, y;
-{
+static bool cpufire(int x, int y) {
bool hit, sunk;
ship_t *ss;
ss = NULL;
hits[COMPUTER][x][y] = (hit = (board[PLAYER][x][y])) ? MARK_HIT : MARK_MISS;
- (void) mvprintw(PROMPTLINE, 0,
+ mvprintw(PROMPTLINE, 0,
"I shoot at %c%d. I %s!", y + 'A', x, hit ? "hit" : "miss");
ss = hitship(x, y);
sunk = hit && ss;
if (sunk)
- (void) printw(" I've sunk your %s", ss->name);
- (void)clrtoeol();
+ printw(" I've sunk your %s", ss->name);
+ clrtoeol();
pgoto(y, x);
#ifdef A_COLOR
@@ -944,7 +900,7 @@
attron(COLOR_PAIR(COLOR_GREEN));
}
#endif /* A_COLOR */
- (void)addch((chtype)(hit ? SHOWHIT : SHOWSPLASH));
+ addch((chtype)(hit ? SHOWHIT : SHOWSPLASH));
#ifdef A_COLOR
attrset(0);
#endif /* A_COLOR */
@@ -957,8 +913,7 @@
* unstructuredness below. The five labels are states which need to be held
* between computer turns.
*/
-static bool cputurn()
-{
+static bool cputurn(void) {
#define POSSIBLE(x, y) (ONBOARD(x, y) && !hits[COMPUTER][x][y])
#define RANDOM_FIRE 0
#define RANDOM_HIT 1
@@ -1067,43 +1022,45 @@
if (salvo)
{
- (void)refresh();
- (void)sleep(1);
+ refresh();
+ sleep(1);
}
if (awinna() != -1)
return(FALSE);
#ifdef DEBUG
- (void) mvprintw(PROMPTLINE + 2, 0,
+ mvprintw(PROMPTLINE + 2, 0,
"New state %d, x=%d, y=%d, d=%d",
next, x, y, d);
#endif /* DEBUG */
return(hit);
}
-int
-playagain()
-{
+int playagain(void) {
int j;
ship_t *ss;
- for (ss = cpuship; ss < cpuship + SHIPTYPES; ss++)
- for(j = 0; j < ss->length; j++)
- {
- cgoto(ss->y + j * yincr[ss->dir], ss->x + j * xincr[ss->dir]);
- (void)addch((chtype)ss->symbol);
+ for (ss = cpuship; ss < cpuship + SHIPTYPES; ss++) {
+ for(j = 0; j < ss->length; j++) {
+ cgoto(ss->y + j * yincr[ss->dir], ss->x + j * xincr[ss->dir]);
+ addch((chtype)ss->symbol);
+ }
+ }
+
+ if(awinna()) {
+ ++cpuwon;
+ } else {
+ ++plywon;
}
- if(awinna())
- ++cpuwon;
- else
- ++plywon;
j = 18 + strlen(name);
- if(plywon >= 10)
- ++j;
- if(cpuwon >= 10)
- ++j;
- (void) mvprintw(1,(COLWIDTH-j)/2,
+ if(plywon >= 10) {
+ ++j;
+ } else if(cpuwon >= 10) {
+ ++j;
+ }
+
+ mvprintw(1,(COLWIDTH-j)/2,
"%s: %d Computer: %d",name,plywon,cpuwon);
prompt(2, (awinna()) ? "Want to be humiliated again, %s [yn]? "
@@ -1111,64 +1068,17 @@
return(sgetc("YN") == 'Y');
}
-static void do_options(c,op)
-int c;
-char *op[];
-{
- int i;
-
- if (c > 1)
- {
- for (i=1; i<c; i++)
- {
- switch(op[i][0])
- {
- default:
- case '?':
- (void) fprintf(stderr, "Usage: battle [-s | -b] [-c]\n");
- (void) fprintf(stderr, "\tWhere the options are:\n");
- (void) fprintf(stderr, "\t-s : play a salvo game\n");
- (void) fprintf(stderr, "\t-b : play a blitz game\n");
- (void) fprintf(stderr, "\t-c : ships may be adjacent\n");
+static void usage(void) {
+ fprintf(stderr, "Usage: battle [-s | -b] [-c]\n");
+ fprintf(stderr, "\tWhere the options are:\n");
+ fprintf(stderr, "\t-s : salvo - One shot per ship in play\n");
+ fprintf(stderr, "\t-b : blitz - Fire until you miss\n");
+ fprintf(stderr, "\t-c : closepack - Ships may be adjacent\n");
+ fprintf(stderr, "Blitz and Salvo are mutually exclusive\n");
exit(1);
- break;
- case '-':
- switch(op[i][1])
- {
- case 'b':
- blitz = 1;
- if (salvo == 1)
- {
- (void) fprintf(stderr,
- "Bad Arg: -b and -s are mutually exclusive\n");
- exit(1);
- }
- break;
- case 's':
- salvo = 1;
- if (blitz == 1)
- {
- (void) fprintf(stderr,
- "Bad Arg: -s and -b are mutually exclusive\n");
- exit(1);
- }
- break;
- case 'c':
- closepack = 1;
- break;
- default:
- (void) fprintf(stderr,
- "Bad arg: type \"%s ?\" for usage message\n", op[0]);
- exit(1);
- }
- }
- }
- }
}
-static int scount(who)
-int who;
-{
+static int scount(int who) {
int i, shots;
ship_t *sp;
@@ -1187,61 +1097,65 @@
return(shots);
}
-int
-main(argc, argv)
-int argc;
-char *argv[];
-{
+int main(int argc, char **argv) {
+ int ch;
+
/* revoke */
setgid(getgid());
- do_options(argc, argv);
+ while ((ch = getopt(argc, argv, "bsc")) != -1) {
+ switch (ch) {
+ case 'b':
+ blitz = 1;
+ break;
+ case 's':
+ salvo = 1;
+ break;
+ case 'c':
+ closepack = 1;
+ break;
+ case '?':
+ default:
+ usage();
+ }
+ }
+ argc -= optind;
+ argv += optind;
+
+ if (blitz && salvo)
+ usage();
intro();
- do {
- initgame();
- while(awinna() == -1)
- {
- if (!blitz)
- {
- if (!salvo)
- {
- if(turn)
- (void) cputurn();
- else
- (void) plyturn();
- }
- else
- {
- int i;
- i = scount(turn);
- while (i--)
- {
- if (turn)
- {
- if (cputurn() && awinna() != -1)
- i = 0;
- }
- else
- {
- if (plyturn() && awinna() != -1)
- i = 0;
+ do {
+ initgame();
+ while(awinna() == -1) {
+ if (blitz) {
+ while(turn ? cputurn() : plyturn())
+ continue;
+ } else if (salvo) {
+ int i;
+
+ i = scount(turn);
+ while (i--) {
+ if (turn) {
+ if (cputurn() && awinna() != -1)
+ i = 0;
+ } else {
+ if (plyturn() && awinna() != -1)
+ i = 0;
+ }
+ }
+ } else { /* Normal game */
+ if(turn)
+ cputurn();
+ else
+ plyturn();
}
- }
+ turn = OTHER;
}
- }
- else
- while(turn ? cputurn() : plyturn())
- continue;
- turn = OTHER;
- }
- } while
- (playagain());
+ } while (playagain());
+
uninitgame();
- /*NOTREACHED*/
exit(0);
- /*NOTREACHED*/
}
-
-/* bs.c ends here */
Index: games/grdc/Makefile
===================================================================
RCS file: /home/dcvs/src/games/grdc/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- games/grdc/Makefile 17 Jun 2003 04:25:24 -0000 1.2
+++ games/grdc/Makefile 15 Mar 2005 15:04:05 -0000
@@ -2,7 +2,7 @@
# $DragonFly: src/games/grdc/Makefile,v 1.2 2003/06/17 04:25:24 dillon Exp $
PROG= grdc
-WARNS?= 2
+WARNS?= 6
MAN= grdc.6
DPADD= ${LIBNCURSES}
LDADD= -lncurses
Index: games/grdc/grdc.c
===================================================================
RCS file: /home/dcvs/src/games/grdc/grdc.c,v
retrieving revision 1.4
diff -u -r1.4 grdc.c
--- games/grdc/grdc.c 25 Mar 2004 23:55:13 -0000 1.4
+++ games/grdc/grdc.c 15 Mar 2005 15:03:54 -0000
@@ -56,7 +56,7 @@
main(int argc, char **argv)
{
int i, s, k;
- int n;
+ int n = 0;
int ch;
int scrol;
int forever = 1;
Index: games/worm/worm.c
===================================================================
RCS file: /home/dcvs/src/games/worm/worm.c,v
retrieving revision 1.3
diff -u -r1.3 worm.c
--- games/worm/worm.c 12 Nov 2003 14:53:54 -0000 1.3
+++ games/worm/worm.c 15 Mar 2005 15:00:30 -0000
@@ -88,11 +88,7 @@
void suspend (int);
void wake (int);
-int
-main(argc, argv)
- int argc;
- char **argv;
-{
+int main(int argc, char **argv) {
char ch;
/* revoke */
@@ -174,26 +170,18 @@
waddch(tv, chr);
}
-void
-leave(sig)
-int sig;
-{
+void leave(__unused int sig) {
endwin();
exit(0);
}
-void
-wake(sig)
-int sig;
-{
+void wake(__unused int sig) {
signal(SIGALRM, wake);
fflush(stdout);
process(lastch);
}
-long
-rnd(range)
-{
+long rnd(int range) {
return random() % range;
}
@@ -283,9 +271,7 @@
alarm(1);
}
-void
-crash()
-{
+void crash(void) {
sleep(2);
clear();
move(23, 0);
@@ -295,10 +281,7 @@
leave(0);
}
-void
-suspend(sig)
-int sig;
-{
+void suspend(__unused int sig) {
move(LINES-1, 0);
refresh();
endwin();
@@ -310,9 +293,7 @@
setup();
}
-void
-setup()
-{
+void setup(void) {
clear();
refresh();
touchwin(stw);
Index: games/worms/Makefile
===================================================================
RCS file: /home/dcvs/src/games/worms/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- games/worms/Makefile 17 Jun 2003 04:25:25 -0000 1.2
+++ games/worms/Makefile 15 Mar 2005 14:58:26 -0000
@@ -6,5 +6,6 @@
MAN= worms.6
DPADD= ${LIBCURSES} ${LIBTERMCAP}
LDADD= -lcurses -ltermcap
+WARNS?= 6
.include <bsd.prog.mk>
Index: games/worms/worms.c
===================================================================
RCS file: /home/dcvs/src/games/worms/worms.c,v
retrieving revision 1.3
diff -u -r1.3 worms.c
--- games/worms/worms.c 12 Nov 2003 14:53:54 -0000 1.3
+++ games/worms/worms.c 15 Mar 2005 14:58:14 -0000
@@ -173,11 +173,7 @@
void onsig (int);
void nomem(void);
-int
-main(argc, argv)
- int argc;
- char *argv[];
-{
+int main(int argc, char **argv) {
int x, y, h, n;
struct worm *w;
const struct options *op;
@@ -324,10 +320,7 @@
}
}
-void
-onsig(signo)
- int signo;
-{
+void onsig(__unused int signo) {
sig_caught = 1;
}
Index: games/wump/Makefile
===================================================================
RCS file: /home/dcvs/src/games/wump/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- games/wump/Makefile 17 Jun 2003 04:25:25 -0000 1.2
+++ games/wump/Makefile 15 Mar 2005 14:57:22 -0000
@@ -6,5 +6,6 @@
FILES= wump.info
MAN= wump.6
HIDEGAME=hidegame
+WARNS?= 6
.include <bsd.prog.mk>
Index: games/wump/wump.c
===================================================================
RCS file: /home/dcvs/src/games/wump/wump.c,v
retrieving revision 1.3
diff -u -r1.3 wump.c
--- games/wump/wump.c 12 Nov 2003 14:53:54 -0000 1.3
+++ games/wump/wump.c 15 Mar 2005 14:57:10 -0000
@@ -127,11 +127,7 @@
void wump_kill(void);
int wump_nearby(void);
-int
-main(argc, argv)
- int argc;
- char **argv;
-{
+int main(int argc, char **argv) {
int c;
/* revoke */
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
[
Date Index][
Thread Index]
