X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fbs.c;h=12df0934a58d6abef9885ae7dab0b4bfb2518866;hp=ee7f2271d6bd60ee612550aa148b91ab9ec840d6;hb=b6d0d9ad9e372e856f01a4c283cf784a15993903;hpb=1d7867d33e6954be7c7121b1028ad6768f487752 diff --git a/test/bs.c b/test/bs.c index ee7f2271..12df0934 100644 --- a/test/bs.c +++ b/test/bs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * 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 * @@ -34,7 +34,7 @@ * v2.0 featuring strict ANSI/POSIX conformance, November 1993. * v2.1 with ncurses mouse support, September 1995 * - * $Id: bs.c,v 1.52 2010/11/13 20:07:52 tom Exp $ + * $Id: bs.c,v 1.53 2012/06/09 20:30:32 tom Exp $ */ #include @@ -368,7 +368,7 @@ initgame(void) 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++) @@ -386,7 +386,7 @@ initgame(void) 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++) @@ -769,7 +769,7 @@ hitship(int x, int y) 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 @@ -795,7 +795,7 @@ hitship(int x, int y) 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 @@ -834,9 +834,9 @@ plyturn(void) #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]); @@ -965,9 +965,9 @@ cpufire(int x, int y) #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));