ncurses 5.7 - patch 20101113

[ncurses.git] / test / bs.c

diff --git a/test/bs.c b/test/bs.c
index fd0780bd413a4ffe618101f97e373c664bfc832a..ee7f2271d6bd60ee612550aa148b91ab9ec840d6 100644 (file)
--- a/test/bs.c
+++ b/test/bs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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            *
  *                                                                          *
  * 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
  *
  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
  * v2.1 with ncurses mouse support, September 1995
  *

- * $Id: bs.c,v 1.48 2009/08/29 19:02:25 tom Exp $
+ * $Id: bs.c,v 1.52 2010/11/13 20:07:52 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -222,7 +222,7 @@ intro(void)
 
     if ((tmpname = getlogin()) != 0) {
        (void) strcpy(name, tmpname);
 
     if ((tmpname = getlogin()) != 0) {
        (void) strcpy(name, tmpname);

-       name[0] = toupper(UChar(name[0]));
+       name[0] = (char) toupper(UChar(name[0]));

     } else
        (void) strcpy(name, dftname);
 
     } else
        (void) strcpy(name, dftname);
 


@@ -235,7 +235,7 @@ intro(void)
 
 #ifdef PENGUIN
     (void) clear();
 
 #ifdef PENGUIN
     (void) clear();

-    (void) mvaddstr(4, 29, "Welcome to Battleship!");
+    MvAddStr(4, 29, "Welcome to Battleship!");

     (void) move(8, 0);
     PR("                                                  \\\n");
     PR("                           \\                     \\ \\\n");
     (void) move(8, 0);
     PR("                                                  \\\n");
     PR("                           \\                     \\ \\\n");


@@ -248,7 +248,7 @@ intro(void)
     PR("            \\                                                     /\n");
     PR("             \\___________________________________________________/\n");
 
     PR("            \\                                                     /\n");
     PR("             \\___________________________________________________/\n");
 

-    (void) mvaddstr(22, 27, "Hit any key to continue...");
+    MvAddStr(22, 27, "Hit any key to continue...");

     (void) refresh();
     (void) getch();
 #endif /* PENGUIN */
     (void) refresh();
     (void) getch();
 #endif /* PENGUIN */


@@ -337,7 +337,7 @@ initgame(void)
     ship_t *ss;
 
     (void) clear();
     ship_t *ss;
 
     (void) clear();

-    (void) mvaddstr(0, 35, "BATTLESHIPS");
+    MvAddStr(0, 35, "BATTLESHIPS");

     (void) move(PROMPTLINE + 2, 0);
     announceopts();
 
     (void) move(PROMPTLINE + 2, 0);
     announceopts();
 


@@ -362,10 +362,10 @@ initgame(void)
     }
 
     /* draw empty boards */
     }
 
     /* 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) {
     for (i = 0; i < BDEPTH; ++i) {

-       (void) mvaddch(PYBASE + i, PXBASE - 3, (chtype) (i + 'A'));
+       MvAddCh(PYBASE + i, PXBASE - 3, (chtype) (i + 'A'));

 #ifdef A_COLOR
        if (has_colors())
            attron(COLOR_PAIR(COLOR_BLUE));
 #ifdef A_COLOR
        if (has_colors())
            attron(COLOR_PAIR(COLOR_BLUE));


@@ -379,11 +379,11 @@ initgame(void)
        (void) addch(' ');
        (void) addch((chtype) (i + 'A'));
     }
        (void) addch(' ');
        (void) addch((chtype) (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) {
     for (i = 0; i < BDEPTH; ++i) {

-       (void) mvaddch(CYBASE + i, CXBASE - 3, (chtype) (i + 'A'));
+       MvAddCh(CYBASE + i, CXBASE - 3, (chtype) (i + 'A'));

 #ifdef A_COLOR
        if (has_colors())
            attron(COLOR_PAIR(COLOR_BLUE));
 #ifdef A_COLOR
        if (has_colors())
            attron(COLOR_PAIR(COLOR_BLUE));


@@ -398,27 +398,27 @@ initgame(void)
        (void) addch((chtype) (i + 'A'));
     }
 
        (void) addch((chtype) (i + 'A'));
     }
 

-    (void) mvaddstr(CYBASE + BDEPTH, CXBASE - 3, numbers);
-
-    (void) mvprintw(HYBASE, HXBASE,
-                   "To position your ships: move the cursor to a spot, then");
-    (void) mvprintw(HYBASE + 1, HXBASE,
-                   "type the first letter of a ship type to select it, then");
-    (void) mvprintw(HYBASE + 2, HXBASE,
-                   "type a direction ([hjkl] or [4862]), indicating how the");
-    (void) mvprintw(HYBASE + 3, HXBASE,
-                   "ship should be pointed. You may also type a ship letter");
-    (void) mvprintw(HYBASE + 4, HXBASE,
-                   "followed by `r' to position it randomly, or type `R' to");
-    (void) 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(CYBASE + BDEPTH, CXBASE - 3, numbers);
+
+    MvPrintw(HYBASE, HXBASE,
+            "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");
+    MvPrintw(HYBASE + 2, HXBASE,
+            "type a direction ([hjkl] or [4862]), indicating how the");
+    MvPrintw(HYBASE + 3, HXBASE,
+            "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");
+    MvPrintw(HYBASE + 5, HXBASE,
+            "place all remaining ships randomly.");
+
+    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++) {
 
     /* have the computer place ships */
     for (ss = cpuship; ss < cpuship + SHIPTYPES; ss++) {


@@ -440,7 +440,7 @@ initgame(void)
        /* get a command letter */
        prompt(1, "Type one of [%s] to pick a ship.", docked + 1);
        do {
        /* get a command letter */
        prompt(1, "Type one of [%s] to pick a ship.", docked + 1);
        do {

-           c = getcoord(PLAYER);
+           c = (char) getcoord(PLAYER);

        } while
            (!strchr(docked, c));
 
        } while
            (!strchr(docked, c));
 


@@ -457,7 +457,7 @@ initgame(void)
        }
 
        do {
        }
 
        do {

-           c = getch();
+           c = (char) getch();

        } while
            (!(strchr("hjklrR", c) || c == FF));
 
        } while
            (!(strchr("hjklrR", c) || c == FF));
 


@@ -518,18 +518,18 @@ initgame(void)
 
     turn = rnd(2);
 
 
     turn = rnd(2);
 

-    (void) mvprintw(HYBASE, HXBASE,
-                   "To fire, move the cursor to your chosen aiming point   ");
-    (void) mvprintw(HYBASE + 1, HXBASE,
-                   "and strike any key other than a motion key.            ");
-    (void) mvprintw(HYBASE + 2, HXBASE,
-                   "                                                       ");
-    (void) mvprintw(HYBASE + 3, HXBASE,
-                   "                                                       ");
-    (void) mvprintw(HYBASE + 4, HXBASE,
-                   "                                                       ");
-    (void) mvprintw(HYBASE + 5, HXBASE,
-                   "                                                       ");
+    MvPrintw(HYBASE, HXBASE,
+            "To fire, move the cursor to your chosen aiming point   ");
+    MvPrintw(HYBASE + 1, HXBASE,
+            "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();
 
     (void) prompt(0, "Press any key to start...", "");
     (void) getch();


@@ -547,12 +547,12 @@ getcoord(int atcpu)
     (void) refresh();
     for (;;) {
        if (atcpu) {
     (void) 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 {
            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);
        }
 
            pgoto(cury, curx);
        }
 


@@ -633,9 +633,9 @@ getcoord(int atcpu)
 
        default:
            if (atcpu)
 
        default:
            if (atcpu)

-               (void) mvaddstr(CYBASE + BDEPTH + 1, CXBASE + 11, "      ");
+               MvAddStr(CYBASE + BDEPTH + 1, CXBASE + 11, "      ");

            else
            else

-               (void) mvaddstr(PYBASE + BDEPTH + 1, PXBASE + 11, "      ");
+               MvAddStr(PYBASE + BDEPTH + 1, PXBASE + 11, "      ");

            return (c);
        }
 
            return (c);
        }
 


@@ -829,7 +829,7 @@ plyturn(void)
            break;
     }
     hit = IS_SHIP(board[COMPUTER][curx][cury]);
            break;
     }
     hit = IS_SHIP(board[COMPUTER][curx][cury]);

-    hits[PLAYER][curx][cury] = (hit ? MARK_HIT : MARK_MISS);
+    hits[PLAYER][curx][cury] = (char) (hit ? MARK_HIT : MARK_MISS);

     cgoto(cury, curx);
 #ifdef A_COLOR
     if (has_colors()) {
     cgoto(cury, curx);
 #ifdef A_COLOR
     if (has_colors()) {


@@ -952,10 +952,11 @@ cpufire(int x, int y)
     bool hit, sunk;
     ship_t *ss = NULL;
 
     bool hit, sunk;
     ship_t *ss = NULL;
 

-    hits[COMPUTER][x][y] = (hit = (board[PLAYER][x][y])) ? MARK_HIT : MARK_MISS;
-    (void) mvprintw(PROMPTLINE, 0,
-                   "I shoot at %c%d. I %s!", y + 'A', x, hit ? "hit" :
-                   "miss");
+    hit = board[PLAYER][x][y] ? MARK_HIT : MARK_MISS;
+    hits[COMPUTER][x][y] = (char) hit;
+    MvPrintw(PROMPTLINE, 0,
+            "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();
     if ((sunk = (hit && (ss = hitship(x, y)))) != 0)
        (void) printw(" I've sunk your %s", ss->name);
     (void) clrtoeol();


@@ -1106,9 +1107,9 @@ cputurn(void)
        (void) sleep(1);
     }
 #ifdef DEBUG
        (void) sleep(1);
     }
 #ifdef DEBUG

-    (void) mvprintw(PROMPTLINE + 2, 0,
-                   "New state %d, x=%d, y=%d, d=%d",
-                   next, x, y, d);
+    MvPrintw(PROMPTLINE + 2, 0,
+            "New state %d, x=%d, y=%d, d=%d",
+            next, x, y, d);

 #endif /* DEBUG */
     return ((hit) ? TRUE : FALSE);
 }
 #endif /* DEBUG */
     return ((hit) ? TRUE : FALSE);
 }


@@ -1129,13 +1130,13 @@ playagain(void)
        ++cpuwon;
     else
        ++plywon;
        ++cpuwon;
     else
        ++plywon;

-    j = 18 + strlen(name);
+    j = 18 + (int) strlen(name);

     if (plywon >= 10)
        ++j;
     if (cpuwon >= 10)
        ++j;
     if (plywon >= 10)
        ++j;
     if (cpuwon >= 10)
        ++j;

-    (void) mvprintw(1, (COLWIDTH - j) / 2,
-                   "%s: %d     Computer: %d", name, plywon, cpuwon);
+    MvPrintw(1, (COLWIDTH - j) / 2,
+            "%s: %d     Computer: %d", name, plywon, cpuwon);

 
     prompt(2, (awinna())? "Want to be humiliated again, %s [yn]? "
           : "Going to give me a chance for revenge, %s [yn]? ", name);
 
     prompt(2, (awinna())? "Want to be humiliated again, %s [yn]? "
           : "Going to give me a chance for revenge, %s [yn]? ", name);