sprinkle static

[bsdgames-darwin.git] / gomoku / bdisp.c

diff --git a/gomoku/bdisp.c b/gomoku/bdisp.c
index cf719bb9fb538434bef3b6775abbc8cff457f5e9..a5e25ebdb81adf732d2cdb0c14f109e9edfd84c3 100644 (file)
--- a/gomoku/bdisp.c
+++ b/gomoku/bdisp.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: bdisp.c,v 1.7 2001/02/05 00:30:38 christos Exp $       */
+/*     $NetBSD: bdisp.c,v 1.12 2009/07/13 19:05:40 roy Exp $   */

 
 /*
  * Copyright (c) 1994
 
 /*
  * Copyright (c) 1994


@@ -15,11 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors

  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -41,12 +37,13 @@
 #if 0
 static char sccsid[] = "@(#)bdisp.c    8.2 (Berkeley) 5/3/95";
 #else
 #if 0
 static char sccsid[] = "@(#)bdisp.c    8.2 (Berkeley) 5/3/95";
 #else

-__RCSID("$NetBSD: bdisp.c,v 1.7 2001/02/05 00:30:38 christos Exp $");
+__RCSID("$NetBSD: bdisp.c,v 1.12 2009/07/13 19:05:40 roy Exp $");

 #endif
 #endif /* not lint */
 
 #include <curses.h>
 #include <string.h>
 #endif
 #endif /* not lint */
 
 #include <curses.h>
 #include <string.h>

+#include <stdlib.h>

 #include "gomoku.h"
 
 #define        SCRNH           24              /* assume 24 lines for the moment */
 #include "gomoku.h"
 
 #define        SCRNH           24              /* assume 24 lines for the moment */


@@ -62,10 +59,13 @@ extern char *plyr[];
  * Initialize screen display.
  */
 void
  * Initialize screen display.
  */
 void

-cursinit()
+cursinit(void)

 {
 
 {
 

-       initscr();
+       if (!initscr()) {
+               fprintf(stderr, "couldn't initialize screen\n");
+               exit (0);
+       }

        noecho();
        cbreak();
        leaveok(stdscr, TRUE);
        noecho();
        cbreak();
        leaveok(stdscr, TRUE);


@@ -75,7 +75,7 @@ cursinit()
  * Restore screen display.
  */
 void
  * Restore screen display.
  */
 void

-cursfini()
+cursfini(void)

 {
 
        leaveok(stdscr, FALSE);
 {
 
        leaveok(stdscr, FALSE);


@@ -89,7 +89,7 @@ cursfini()
  * Initialize board display.
  */
 void
  * Initialize board display.
  */
 void

-bdisp_init()
+bdisp_init(void)

 {
        int i, j;
 
 {
        int i, j;
 


@@ -121,8 +121,7 @@ bdisp_init()
  * Update who is playing whom.
  */
 void
  * Update who is playing whom.
  */
 void

-bdwho(update)
-       int update;
+bdwho(int update)

 {
        int i;
 
 {
        int i;
 


@@ -144,7 +143,7 @@ bdwho(update)
  * Update the board display after a move.
  */
 void
  * Update the board display after a move.
  */
 void

-bdisp()
+bdisp(void)

 {
        int i, j, c;
        struct spotstr *sp;
 {
        int i, j, c;
        struct spotstr *sp;


@@ -154,9 +153,9 @@ bdisp()
                        move(BSZ1 - j, 2 * i + 1);
                        sp = &board[i + j * BSZ1];
                        if (debug > 1 && sp->s_occ == EMPTY) {
                        move(BSZ1 - j, 2 * i + 1);
                        sp = &board[i + j * BSZ1];
                        if (debug > 1 && sp->s_occ == EMPTY) {

-                               if (sp->s_flg & IFLAGALL)
+                               if (sp->s_flags & IFLAGALL)

                                        c = '+';
                                        c = '+';

-                               else if (sp->s_flg & CFLAGALL)
+                               else if (sp->s_flags & CFLAGALL)

                                        c = '-';
                                else
                                        c = '.';
                                        c = '-';
                                else
                                        c = '.';


@@ -173,8 +172,7 @@ bdisp()
  * Dump board display to a file.
  */
 void
  * Dump board display to a file.
  */
 void

-bdump(fp)
-       FILE *fp;
+bdump(FILE *fp)

 {
        int i, j, c;
        struct spotstr *sp;
 {
        int i, j, c;
        struct spotstr *sp;


@@ -188,9 +186,9 @@ bdump(fp)
                for (i = 1; i < BSZ1; i++) {
                        sp = &board[i + j * BSZ1];
                        if (debug > 1 && sp->s_occ == EMPTY) {
                for (i = 1; i < BSZ1; i++) {
                        sp = &board[i + j * BSZ1];
                        if (debug > 1 && sp->s_occ == EMPTY) {

-                               if (sp->s_flg & IFLAGALL)
+                               if (sp->s_flags & IFLAGALL)

                                        c = '+';
                                        c = '+';

-                               else if (sp->s_flg & CFLAGALL)
+                               else if (sp->s_flags & CFLAGALL)

                                        c = '-';
                                else
                                        c = '.';
                                        c = '-';
                                else
                                        c = '.';


@@ -212,8 +210,7 @@ bdump(fp)
  * Display a transcript entry
  */
 void
  * Display a transcript entry
  */
 void

-dislog(str)
-       const char *str;
+dislog(const char *str)

 {
 
        if (++lastline >= SCRNH - 1) {
 {
 
        if (++lastline >= SCRNH - 1) {


@@ -232,8 +229,7 @@ dislog(str)
  */
 
 void
  */
 
 void

-ask(str)
-       const char *str;
+ask(const char *str)

 {
        int len = strlen(str);
 
 {
        int len = strlen(str);
 


@@ -245,9 +241,7 @@ ask(str)
 }
 
 int
 }
 
 int

-getline(buf, size)
-       char *buf;
-       int size;
+get_line(char *buf, int size)

 {
        char *cp, *end;
        int c;
 {
        char *cp, *end;
        int c;