/****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
* v2.0 featuring strict ANSI/POSIX conformance, November 1993.
* v2.1 with ncurses mouse support, September 1995
*
- * $Id: bs.c,v 1.56 2012/12/08 23:35:58 tom Exp $
+ * $Id: bs.c,v 1.63 2014/08/09 22:27:12 tom Exp $
*/
#include <test.priv.h>
static char destroy[] = "Destroyer";
static char ptboat[] = "PT Boat";
-static char name[40];
+static char *your_name;
static char dftname[] = "stranger";
/* direction constants */
#define PR (void)addstr
-static RETSIGTYPE uninitgame(int sig) GCC_NORETURN;
+static void uninitgame(int sig) GCC_NORETURN;
-static RETSIGTYPE
+static void
uninitgame(int sig GCC_UNUSED)
/* end the game, either normally or due to signal */
{
CATCHALL(uninitgame);
- if ((tmpname = getlogin()) != 0) {
- (void) strcpy(name, tmpname);
- name[0] = (char) toupper(UChar(name[0]));
- } else
- (void) strcpy(name, dftname);
+ if ((tmpname = getlogin()) != 0 &&
+ (your_name = strdup(tmpname)) != 0) {
+ your_name[0] = (char) toupper(UChar(your_name[0]));
+ } else {
+ your_name = dftname;
+ }
(void) initscr();
keypad(stdscr, TRUE);
MvAddCh(PYBASE + i, PXBASE - 3, (chtype) (i + 'A'));
#ifdef A_COLOR
if (has_colors())
- attron((attr_t) COLOR_PAIR(COLOR_BLUE));
+ attron(COLOR_PAIR(COLOR_BLUE));
#endif /* A_COLOR */
(void) addch(' ');
for (j = 0; j < BWIDTH; j++)
MvAddCh(CYBASE + i, CXBASE - 3, (chtype) (i + 'A'));
#ifdef A_COLOR
if (has_colors())
- attron((attr_t) COLOR_PAIR(COLOR_BLUE));
+ attron(COLOR_PAIR(COLOR_BLUE));
#endif /* A_COLOR */
(void) addch(' ');
for (j = 0; j < BWIDTH; j++)
do {
c = (char) getcoord(PLAYER);
} while
- (!strchr(docked, c));
+ (!(strchr) (docked, c));
if (c == 'R')
(void) ungetch('R');
cgoto(y1, x1);
#ifdef A_COLOR
if (has_colors())
- attron((attr_t) COLOR_PAIR(COLOR_GREEN));
+ attron(COLOR_PAIR(COLOR_GREEN));
#endif /* A_COLOR */
(void) addch(MARK_MISS);
#ifdef A_COLOR
pgoto(y1, x1);
#ifdef A_COLOR
if (has_colors())
- attron((attr_t) COLOR_PAIR(COLOR_RED));
+ attron(COLOR_PAIR(COLOR_RED));
#endif /* A_COLOR */
(void) addch(SHOWHIT);
#ifdef A_COLOR
#ifdef A_COLOR
if (has_colors()) {
if (hit)
- attron((attr_t) COLOR_PAIR(COLOR_RED));
+ attron(COLOR_PAIR(COLOR_RED));
else
- attron((attr_t) COLOR_PAIR(COLOR_GREEN));
+ attron(COLOR_PAIR(COLOR_GREEN));
}
#endif /* A_COLOR */
(void) addch((chtype) hits[PLAYER][curx][cury]);
bool hit, sunk;
ship_t *ss = NULL;
- hit = board[PLAYER][x][y] ? MARK_HIT : MARK_MISS;
- hits[COMPUTER][x][y] = (char) hit;
+ hit = (bool) board[PLAYER][x][y];
+ hits[COMPUTER][x][y] = (hit ? MARK_HIT : MARK_MISS);
MvPrintw(PROMPTLINE, 0,
"I shoot at %c%d. I %s!", y + 'A', x, hit ? "hit" :
"miss");
#ifdef A_COLOR
if (has_colors()) {
if (hit)
- attron((attr_t) COLOR_PAIR(COLOR_RED));
+ attron(COLOR_PAIR(COLOR_RED));
else
- attron((attr_t) COLOR_PAIR(COLOR_GREEN));
+ attron(COLOR_PAIR(COLOR_GREEN));
}
#endif /* A_COLOR */
(void) addch((chtype) (hit ? SHOWHIT : SHOWSPLASH));
++cpuwon;
else
++plywon;
- j = 18 + (int) strlen(name);
+ j = 18 + (int) strlen(your_name);
if (plywon >= 10)
++j;
if (cpuwon >= 10)
++j;
MvPrintw(1, (COLWIDTH - j) / 2,
- "%s: %d Computer: %d", name, plywon, cpuwon);
+ "%s: %d Computer: %d", your_name, plywon, cpuwon);
prompt(2, (awinna())? "Want to be humiliated again, %s [yn]? "
- : "Going to give me a chance for revenge, %s [yn]? ", name);
+ : "Going to give me a chance for revenge, %s [yn]? ", your_name);
return (sgetc("YN") == 'Y');
}