/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2008,2009 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.44 2006/05/20 15:38:52 tom Exp $
+ * $Id: bs.c,v 1.48 2009/08/29 19:02:25 tom Exp $
*/
#include <test.priv.h>
if ((tmpname = getlogin()) != 0) {
(void) strcpy(name, tmpname);
- name[0] = toupper(name[0]);
+ name[0] = toupper(UChar(name[0]));
} else
(void) strcpy(name, dftname);
for (j = 0; j < BWIDTH; j++)
(void) addstr(" . ");
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
(void) addch(' ');
(void) addch((chtype) (i + 'A'));
for (j = 0; j < BWIDTH; j++)
(void) addstr(" . ");
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
(void) addch(' ');
(void) addch((chtype) (i + 'A'));
do {
c = getch();
} while
- (!strchr("hjklrR", c) || c == FF);
+ (!(strchr("hjklrR", c) || c == FF));
if (c == FF) {
(void) clearok(stdscr, TRUE);
(void) refresh();
} 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;
#endif /* A_COLOR */
(void) addch(MARK_MISS);
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
} else {
pgoto(y1, x1);
#endif /* A_COLOR */
(void) addch(SHOWHIT);
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
}
}
#endif /* A_COLOR */
(void) addch((chtype) hits[PLAYER][curx][cury]);
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
prompt(1, "You %s.", hit ? "scored a hit" : "missed");
#endif /* A_COLOR */
(void) addch((chtype) (hit ? SHOWHIT : SHOWSPLASH));
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
return hit ? (sunk ? S_SUNK : S_HIT) : S_MISS;