/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2010,2012 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.51 2010/05/01 19:12:26 tom Exp $
+ * $Id: bs.c,v 1.59 2012/12/16 00:20:49 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 */
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(COLOR_PAIR(COLOR_BLUE));
+ attron((attr_t) 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(COLOR_PAIR(COLOR_BLUE));
+ attron((attr_t) COLOR_PAIR(COLOR_BLUE));
#endif /* A_COLOR */
(void) addch(' ');
for (j = 0; j < BWIDTH; j++)
MvAddStr(CYBASE + BDEPTH, CXBASE - 3, numbers);
MvPrintw(HYBASE, HXBASE,
- "To position your ships: move the cursor to a spot, then");
+ "To position your ships: move the cursor to a spot, then");
MvPrintw(HYBASE + 1, HXBASE,
- "type the first letter of a ship type to select it, then");
+ "type the first letter of a ship type to select it, then");
MvPrintw(HYBASE + 2, HXBASE,
- "type a direction ([hjkl] or [4862]), indicating how the");
+ "type a direction ([hjkl] or [4862]), indicating how the");
MvPrintw(HYBASE + 3, HXBASE,
- "ship should be pointed. You may also type a ship letter");
+ "ship should be pointed. You may also type a ship letter");
MvPrintw(HYBASE + 4, HXBASE,
- "followed by `r' to position it randomly, or type `R' to");
+ "followed by `r' to position it randomly, or type `R' to");
MvPrintw(HYBASE + 5, HXBASE,
- "place all remaining ships randomly.");
+ "place all remaining ships randomly.");
MvAddStr(MYBASE, MXBASE, "Aiming keys:");
MvAddStr(SYBASE, SXBASE, "y k u 7 8 9");
placeship(COMPUTER, ss, FALSE);
}
- ss = (ship_t *) NULL;
do {
char c, docked[SHIPTYPES + 2], *cp = docked;
+ ss = (ship_t *) NULL;
+
/* figure which ships still wait to be placed */
*cp++ = 'R';
for (i = 0; i < SHIPTYPES; i++)
do {
c = (char) getch();
} while
- (!(strchr("hjklrR", c) || c == FF));
+ (!(strchr("hjkl8462rR", c) || c == FF));
if (c == FF) {
(void) clearok(stdscr, TRUE);
(void) refresh();
+ } else if (ss == 0) {
+ beep(); /* simple to verify, unlikely to happen */
} else if (c == 'r') {
- assert(ss != 0);
prompt(1, "Random-placing your %s", ss->name);
randomplace(PLAYER, ss);
placeship(PLAYER, ss, TRUE);
}
error((char *) NULL);
} else if (strchr("hjkl8462", c)) {
- assert(ss != 0);
ss->x = curx;
ss->y = cury;
turn = rnd(2);
MvPrintw(HYBASE, HXBASE,
- "To fire, move the cursor to your chosen aiming point ");
+ "To fire, move the cursor to your chosen aiming point ");
MvPrintw(HYBASE + 1, HXBASE,
- "and strike any key other than a motion key. ");
+ "and strike any key other than a motion key. ");
MvPrintw(HYBASE + 2, HXBASE,
- " ");
+ " ");
MvPrintw(HYBASE + 3, HXBASE,
- " ");
+ " ");
MvPrintw(HYBASE + 4, HXBASE,
- " ");
+ " ");
MvPrintw(HYBASE + 5, HXBASE,
- " ");
+ " ");
(void) prompt(0, "Press any key to start...", "");
(void) getch();
for (;;) {
if (atcpu) {
MvPrintw(CYBASE + BDEPTH + 1, CXBASE + 11, "(%d, %c)",
- curx, 'A' + cury);
+ curx, 'A' + cury);
cgoto(cury, curx);
} else {
MvPrintw(PYBASE + BDEPTH + 1, PXBASE + 11, "(%d, %c)",
- curx, 'A' + cury);
+ curx, 'A' + cury);
pgoto(cury, curx);
}
cgoto(y1, x1);
#ifdef A_COLOR
if (has_colors())
- attron(COLOR_PAIR(COLOR_GREEN));
+ attron((attr_t) COLOR_PAIR(COLOR_GREEN));
#endif /* A_COLOR */
(void) addch(MARK_MISS);
#ifdef A_COLOR
pgoto(y1, x1);
#ifdef A_COLOR
if (has_colors())
- attron(COLOR_PAIR(COLOR_RED));
+ attron((attr_t) COLOR_PAIR(COLOR_RED));
#endif /* A_COLOR */
(void) addch(SHOWHIT);
#ifdef A_COLOR
#ifdef A_COLOR
if (has_colors()) {
if (hit)
- attron(COLOR_PAIR(COLOR_RED));
+ attron((attr_t) COLOR_PAIR(COLOR_RED));
else
- attron(COLOR_PAIR(COLOR_GREEN));
+ attron((attr_t) COLOR_PAIR(COLOR_GREEN));
}
#endif /* A_COLOR */
(void) addch((chtype) hits[PLAYER][curx][cury]);
m = " You'll pick up survivors from my %s, I hope...!";
break;
}
- (void) printw(m, ss->name);
+ if (m != 0) {
+ (void) printw(m, ss->name);
+ }
(void) beep();
}
return (hit);
bool hit, sunk;
ship_t *ss = NULL;
- hit = board[PLAYER][x][y] ? MARK_HIT : MARK_MISS;
- hits[COMPUTER][x][y] = (char) hit;
+ hit = 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");
+ "I shoot at %c%d. I %s!", y + 'A', x, hit ? "hit" :
+ "miss");
if ((sunk = (hit && (ss = hitship(x, y)))) != 0)
(void) printw(" I've sunk your %s", ss->name);
(void) clrtoeol();
#ifdef A_COLOR
if (has_colors()) {
if (hit)
- attron(COLOR_PAIR(COLOR_RED));
+ attron((attr_t) COLOR_PAIR(COLOR_RED));
else
- attron(COLOR_PAIR(COLOR_GREEN));
+ attron((attr_t) COLOR_PAIR(COLOR_GREEN));
}
#endif /* A_COLOR */
(void) addch((chtype) (hit ? SHOWHIT : SHOWSPLASH));
}
#ifdef DEBUG
MvPrintw(PROMPTLINE + 2, 0,
- "New state %d, x=%d, y=%d, d=%d",
- next, x, y, d);
+ "New state %d, x=%d, y=%d, d=%d",
+ next, x, y, d);
#endif /* DEBUG */
return ((hit) ? TRUE : FALSE);
}
++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');
}
projects / ncurses.git / blobdiff