X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/0e779d807aa1830dde2f4a75117fd16f5627dc76..bed729727d8fef3695e5252f17cfbbe8f2aca879:/curses.c

diff --git a/curses.c b/curses.c
index aab808d..98465b6 100644
--- a/curses.c
+++ b/curses.c
@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: curses.c,v 1.33 1999/05/16 06:56:25 mhw Exp $
  */
 
 #include "netris.h"
@@ -31,32 +29,30 @@
 #include "curses.h"
 #include "util.h"
 #include "board.h"
-#include "msg.en.h"
+#include "msg.h"
 
 #ifdef NCURSES_VERSION
 # define HAVE_NCURSES
 #endif
 
+window_t window[MAX_SCREENS];
+
 static MyEventType KeyGenFunc(EventGenRec *gen, MyEvent *event);
-static EventGenRec keyGen =
-//		{ NULL, 0, FT_read, STDIN_FILENO, KeyGenFunc, EM_key };
-		{ NULL, 0, FT_read, STDIN_FILENO, KeyGenFunc, EM_key };
+static EventGenRec keyGen = {
+	NULL, 0, FT_read, STDIN_FILENO, KeyGenFunc, EM_key
+};
 
-static int boardYPos[MAX_SCREENS], boardXPos[MAX_SCREENS];
-static int boardSize[MAX_SCREENS];
-//^^^struct
 static int statusYPos, statusXPos;
 static int messageYPos, messageXPos, messageHeight, messageWidth;
 WINDOW *msgwin;
 static int haveColor;
-int PlayerDisp[MAX_SCREENS];
 
-#define MSG_HEIGHT 64 //max history
-char *message[MSG_HEIGHT];
-char messages[MSG_HEIGHT][MSG_WIDTH];
+#define MSG_HEIGHT 64  //max history
+static char *message[MSG_HEIGHT];
+static char messages[MSG_HEIGHT][MSG_WIDTH];
 
-static char *term_vi;	/* String to make cursor invisible */
-static char *term_ve;	/* String to make cursor visible */
+static char *term_vi;  /* String to make cursor invisible */
+static char *term_ve;  /* String to make cursor visible */
 
 void InitScreens(void)
 {
@@ -69,7 +65,7 @@ void InitScreens(void)
 	 * Ctrl-C during initialization might leave the terminal in a bad state.
 	 */
 	BlockSignals(&oldMask, SIGINT, 0);
-	initscr();		//start curses
+	initscr();  //start curses
 
 #ifdef CURSES_HACK
 	{
@@ -86,14 +82,14 @@ void InitScreens(void)
 			char type;
 			short color;
 		} myColorTable[] = {
-			{ BT_white,		COLOR_WHITE },
-			{ BT_blue,		COLOR_BLUE },
-			{ BT_magenta,	COLOR_MAGENTA },
-			{ BT_cyan,		COLOR_CYAN },
-			{ BT_yellow,	COLOR_YELLOW },
-			{ BT_green,		COLOR_GREEN },
-			{ BT_red,		COLOR_RED },
-			{ BT_none,		0 }
+			{ BT_T, COLOR_WHITE },
+			{ BT_I, COLOR_BLUE },
+			{ BT_O, COLOR_MAGENTA },
+			{ BT_L, COLOR_CYAN },
+			{ BT_J, COLOR_YELLOW },
+			{ BT_S, COLOR_GREEN },
+			{ BT_Z, COLOR_RED },
+			{ BT_none, 0 }
 		}; //myColorTable
 		int i = 0;
 
@@ -103,40 +99,40 @@ void InitScreens(void)
 		} //I've never worked on a color-changable terminal, so no idea..
 		for (i = 0; myColorTable[i].type != BT_none; ++i)
 			init_pair(myColorTable[i].type, COLOR_BLACK,
-					myColorTable[i].color);
+				myColorTable[i].color);
 	} //haveColor
 #else
 	haveColor = 0;
 #endif
 
-	AtExit(CleanupScreens);		//restore everything when done
+	AtExit(CleanupScreens);        //restore everything when done
 	RestoreSignals(NULL, &oldMask);
 
-	cbreak();					//no line buffering
+	cbreak();                      //no line buffering
 	noecho();
-//	keypad(stdscr, TRUE);		//get arrow/functionkeys 'n stuff
+//	keypad(stdscr, TRUE);          //get arrow/functionkeys 'n stuff
 	OutputTermStr(term_vi, 0);
-	AddEventGen(&keyGen);		//key handler
-	signal(SIGWINCH, CatchWinCh);	//handle window resize
+	AddEventGen(&keyGen);          //key handler
+	signal(SIGWINCH, CatchWinCh);  //handle window resize
 //  ioctl(STDIN_FILENO, KDSKBMODE, K_MEDIUMRAW);
-	standend();					//normal text
+	standend();                    //normal text
 
 	memset(messages, 0, sizeof(messages)); //empty messages
 	{
 		int i;
 		for (i = 0; i<MSG_HEIGHT; i++)
-			message[i] = messages[i]; //set pointers
+			message[i] = messages[i];  //set pointers
 	}
-} //InitScreens
+}
 
 void CleanupScreens(void)
 {
 	RemoveEventGen(&keyGen);
-	endwin();					//end curses
+	endwin();                      //end curses
 	OutputTermStr(term_ve, 1);
-} //CleanupScreens
+}
 
-void GetTermcapInfo(void)
+static void GetTermcapInfo(void)
 {
 	char *term, *buf, *data;
 	int bufSize = 8192;
@@ -175,15 +171,15 @@ void GetTermcapInfo(void)
 	 */
 	if (!term_vi || !term_ve) {
 		static char *vts[] = {
-				"vt100", "vt101", "vt102",
-				"vt200", "vt220", "vt300",
-				"vt320", "vt400", "vt420",
-				"screen", "xterm", NULL };
+			"vt100", "vt101", "vt102",
+			"vt200", "vt220", "vt300",
+			"vt320", "vt400", "vt420",
+			"screen", "xterm", NULL
+		};
 		int i;
 
 		for (i = 0; vts[i]; i++)
-			if (!strcmp(term, vts[i]))
-			{
+			if (!strcmp(term, vts[i])) {
 				term_vi = "\033[?25l";
 				term_ve = "\033[?25h";
 				break;
@@ -191,20 +187,20 @@ void GetTermcapInfo(void)
 	}
 	if (!term_vi || !term_ve)
 		term_vi = term_ve = NULL;
-} //GetTermcapInfo
+}
 
-void OutputTermStr(char *str, int flush)
+static void OutputTermStr(char *str, int flush)
 {
 	if (str) {
 		fputs(str, stdout);
 		if (flush) fflush(stdout);
 	}
-} //OutputTermStr
+}
 
-void DrawTitle(void)
+static void DrawTitle(void)
 {
 	int rows, cols;
-	char s[255];
+	char *s;
 
 #ifdef HAVE_NCURSES
 	attrset(A_REVERSE);
@@ -212,15 +208,17 @@ void DrawTitle(void)
 	standout();
 #endif
 	getmaxyx(stdscr, rows, cols);
-	sprintf(s, " NETRIS %s", version_string);
-	memset(&s[strlen(s)], ' ', 254 - strlen(s));
-	if (cols > 56 + strlen(version_string))
-		memcpy(&s[cols - 48],
-			"(C)1994-1996,1999 Mark H. Weaver, (C)2002 Shiar \0", 49);
-	else memcpy(&s[cols], "\0", 1);
+	s = malloc(cols + 1);
+	sprintf(s, " " MSG_TITLE " %s", version_string);
+	const int titlelen = strlen(s);
+	memset(&s[titlelen], ' ', cols - titlelen); // pad
+	if (cols > titlelen + 1 + strlen(MSG_TITLESUB))
+		memcpy(&s[cols - 1 - strlen(MSG_TITLESUB)], MSG_TITLESUB, sizeof(MSG_TITLESUB) - 1);
+	memcpy(&s[cols], "\0", 1);
 	mvaddstr(0, 0, s);
+	free(s);
 	standend();	//normal text
-} //DrawTitle
+}
 
 void DrawBox(int x1, int y1, int x2, int y2)
 { //draw grid
@@ -240,15 +238,15 @@ void DrawBox(int x1, int y1, int x2, int y2)
 	for (x = x1 + 1; x < x2; x++)
 		addch(Sets.ascii ? '-' : ACS_HLINE);
 	addch(Sets.ascii ? '+' : ACS_LRCORNER);
-} //DrawBox
+}
 
 void DrawField(int scr)
 { //draw field for player scr
-	if (!PlayerDisp[scr]) return; 
-	DrawBox(boardXPos[scr] - 1, boardYPos[scr] - Players[scr].boardVisible,
-		boardXPos[scr] + boardSize[scr] * Players[scr].boardWidth, boardYPos[scr] + 1);
+	if (!window[scr].shown) return; 
+	DrawBox(window[scr].posx - 1, window[scr].posy - Players[scr].boardVisible,
+		window[scr].posx + window[scr].size * Players[scr].boardWidth, window[scr].posy + 1);
 	{
-		char s[boardSize[scr]*Players[scr].boardWidth+1];
+		char s[window[scr].size * Players[scr].boardWidth + 1];
 
 		if (Players[scr].host && Players[scr].host[0])
 			snprintf(s, sizeof(s), " %s <%s> ",
@@ -257,7 +255,7 @@ void DrawField(int scr)
 		s[sizeof(s)] = 0;
 		if (haveColor && Players[scr].team > 0 && Players[scr].team <= 7)
 			attrset(A_REVERSE | COLOR_PAIR(Players[scr].team + 1));
-		mvaddstr(1, boardXPos[scr], s);
+		mvaddstr(1, window[scr].posx, s);
 		if (haveColor) standend();
 	} //display playername/host
 
@@ -269,7 +267,7 @@ void DrawField(int scr)
 	} //draw field
 
 	ShowPause(scr);
-} //DrawField
+}
 
 void InitFields(void)
 { //calculate positions of all fields
@@ -280,20 +278,20 @@ void InitFields(void)
 	clear();
 	DrawTitle();
 	getmaxyx(stdscr, y, x);
-	boardSize[me] = 2;
-	boardXPos[me] = 1;
-	boardYPos[me] = 21;
-	PlayerDisp[me] = 1;
-	statusXPos = boardSize[me] * Players[me].boardWidth + 3;
+	window[me].size = 2;
+	window[me].posx = 1;
+	window[me].posy = 21;
+	window[me].shown = 1;
+	statusXPos = window[me].size * Players[me].boardWidth + 3;
 	statusYPos = 21;
 	ShowScore(me, Players[me].score);
 
 	messageXPos = 2;
 	messageYPos = 24;
-	if ((messageWidth = x - messageXPos - 2) > MSG_WIDTH) messageWidth = MSG_WIDTH;
-	if ((messageHeight = y - messageYPos - 1) > MSG_HEIGHT) messageHeight = MSG_HEIGHT;
-	if (messageHeight <= 0) {
-		messageWidth = 27;
+	messageWidth  = MIN(x - messageXPos - 2, MSG_WIDTH);
+	messageHeight = MIN(y - messageYPos - 1, MSG_HEIGHT);
+	if (messageHeight < 3) {
+		messageWidth = MIN(x - statusXPos - 18, 27);
 		messageHeight = y - 3;
 		messageXPos = statusXPos + 16;
 		messageYPos = 2;
@@ -301,7 +299,7 @@ void InitFields(void)
 	DrawBox(messageXPos - 2, messageYPos - 1,
 		messageXPos + messageWidth + 1, messageYPos+messageHeight);
 	if (msgwin = subwin(stdscr, messageHeight, messageWidth,
-				messageYPos, messageXPos))
+	                    messageYPos, messageXPos))
 		scrollok(msgwin, 1);  //allow scrolling
 	wmove(msgwin, messageHeight - 2, 0);
 	for (scr = messageHeight - 2; scr >= 0; scr--) //display message history
@@ -312,36 +310,32 @@ void InitFields(void)
 		spaceavail -= Players[scr].boardWidth+2;
 	prevscr = me;
 	for (scr = 1; scr < MAX_SCREENS; scr++) if (scr != me) {
-		boardYPos[scr] = 21;
-		boardXPos[scr] =
-			boardXPos[prevscr] + 2 + boardSize[prevscr] * Players[prevscr].boardWidth;
+		window[scr].posy = 21;
+		window[scr].posx =
+			window[prevscr].posx + 2 + window[prevscr].size * Players[prevscr].boardWidth;
 		if (prevscr == me) {
-			boardXPos[scr] += 15; //scorebar
+			window[scr].posx += 15; //scorebar
 			if (messageYPos < 24)
-				boardXPos[scr] += messageWidth + 4; //messagebox
-			spaceavail -= boardXPos[scr] - 3;
+				window[scr].posx += messageWidth + 4; //messagebox
+			spaceavail -= window[scr].posx - 3;
 		} //stuff before second player
 		if (spaceavail >= 0) {
-			boardSize[scr] = 2;
+			window[scr].size = 2;
 			spaceavail -= Players[scr].boardWidth;
 		} //not enough space, half width
 		else
-			boardSize[scr] = 1;
-		if (x < boardXPos[scr] + 1 + boardSize[scr] * Players[scr].boardWidth)
-			PlayerDisp[scr] = 0; //field doesn't fit on screen
+			window[scr].size = 1;
+		if (x < window[scr].posx + 1 + window[scr].size * Players[scr].boardWidth)
+			window[scr].shown = 0; //field doesn't fit on screen
 		else
-			PlayerDisp[scr] = 1;
+			window[scr].shown = 1;
 		prevscr = scr;
 	}
 	for (scr = 1; scr <= maxPlayer; scr++)
 		DrawField(scr);
-} //InitFields
-
-void CleanupScreen(int scr)
-{
 }
 
-void DisplayMessage(char *p)
+static void DisplayMessage(char *p)
 {
 	char s[MSG_WIDTH];
 	char *psearch;
@@ -353,14 +347,14 @@ void DisplayMessage(char *p)
 	while (psearch = strchr(p, '\\')) {
 		*psearch = '\0';
 		waddstr(msgwin, p);
-		c = atoi(++psearch)+1;
+		c = atoi(++psearch) + 1;
 		if (haveColor) wattrset(msgwin, A_REVERSE | COLOR_PAIR(c));
 		p = ++psearch;
 	} //search for color escapes (\)
 	waddstr(msgwin, p);
 	if (haveColor) wstandend(msgwin);
 	waddch(msgwin, '\n');
-} //DisplayMessage
+}
 
 void Message(char *fmt, ...)
 { //print game/bot message
@@ -383,7 +377,7 @@ void Message(char *fmt, ...)
 	DisplayMessage(s);
 	wclrtoeol(msgwin);
 	wrefresh(msgwin);
-} //Message
+}
 
 void Messagetype(char c, int x, char *s)
 { //show single typed character
@@ -391,17 +385,17 @@ void Messagetype(char c, int x, char *s)
 		mvwaddch(msgwin, messageHeight-1, (x+1) % (messageWidth-1), ' ');
 	} //escape
 	else {
-		if (c == 13 || c==127) //enter/backspace
+		if (c == 13 || c == 127) //enter/backspace
 			mvwaddch(msgwin, messageHeight - 1, (x+2) % (messageWidth-1),
-				x>=messageWidth-3 ? s[x - messageWidth + 3] : ' ');
+				x >= messageWidth-3 ? s[x - messageWidth + 3] : ' ');
 		else //any character
 			mvwaddch(msgwin, messageHeight - 1, x % (messageWidth-1), c);
 		mvwaddch(msgwin, messageHeight - 1, (x+1) % (messageWidth-1), '_');
 	} //typing mode
 	wrefresh(msgwin);
-} //Messagetype
+}
 
-void PlotBlock1(int y, int x, unsigned char type)
+static void PlotBlock1(int y, int x, unsigned char type)
 { //display block on screen
 	move(y, x);
 	if (type == BT_none) addstr("  ");
@@ -414,66 +408,63 @@ void PlotBlock1(int y, int x, unsigned char type)
 		}
 #endif
 		switch (Sets.drawstyle) {
-			case 2:
-				switch (type & 192) {
-				 case 64:  //right neighbour
-					 addstr("[[");
-					 break;
-				 case 128: //left
-					 addstr("]]");
-					 break;
-				 default:  //both/none
-					 addstr("[]");
-					 break;
-				} //horizontal stickiness
-				break; //ascii horizontally grouped
-			case 3:
-				switch (type & 240) {
-				 case 48:
-					 addstr("||"); break; //middle
-				 case 64: case 80: case 96:
-					 addstr("[="); break; //left end
-				 case 112:
-					 addstr("|="); break;
-				 case 128: case 144: case 160:
-					 addstr("=]"); break; //right end
-				 case 176:
-					 addstr("=|"); break;
-				 case 192: case 208: case 224:
-					 addstr("=="); break;
-				 default:
-					 addstr("[]"); break; //top/bottom/mid
-				} //neighbours
-				break; //ascii semi-grouped
-			case 7:
-				switch (type & 240) {
-				 case 16:  addch(ACS_ULCORNER); addch(ACS_URCORNER); break;//top end
-				 case 32:  addch(ACS_LLCORNER); addch(ACS_LRCORNER); break;//bottom end
-				 case 48:  addch(ACS_VLINE); addch(ACS_VLINE); break;	//vertical middle
-				 case 64:  addch(' '); addch(ACS_HLINE); break;		//left end
-				 case 80:  addch(ACS_ULCORNER); addch(ACS_TTEE); break;	//top left corner
-				 case 96:  addch(ACS_LLCORNER); addch(ACS_BTEE); break;	//bottom left corner
-				 case 112: addch(ACS_LTEE); addch(ACS_PLUS); break;	//vertical+right
-				 case 128: addch(ACS_HLINE); addch(' '); break;		//right end
-				 case 144: addch(ACS_TTEE); addch(ACS_URCORNER); break;	//top right corner
-				 case 160: addch(ACS_BTEE); addch(ACS_LRCORNER); break;	//bottom right corner
-				 case 176: addch(ACS_PLUS); addch(ACS_RTEE); break;	//vertical+left
-				 case 192: addch(ACS_HLINE); addch(ACS_HLINE); break;	//horizontal middle
-				 case 208: addch(ACS_TTEE); addch(ACS_TTEE); break;	//horizontal+down
-				 case 224: addch(ACS_BTEE); addch(ACS_BTEE); break;	//horizontal+up
-				 default:  addstr("[]"); break;
-				} //neighbours
-				break; //curses grouped
+		case 2:
+			switch (type & 192) {
+			case 64:  //right neighbour
+				addstr("[["); break;
+			case 128: //left
+				addstr("]]"); break;
+			default:  //both/none
+				addstr("[]"); break;
+			} //horizontal stickiness
+			break; //ascii horizontally grouped
+		case 3:
+			switch (type & 240) {
+			case 48:
+				addstr("||"); break; //middle
+			case 64: case 80: case 96:
+				addstr("[="); break; //left end
+			case 112:
+				addstr("|="); break;
+			case 128: case 144: case 160:
+				addstr("=]"); break; //right end
+			case 176:
+				addstr("=|"); break;
+			case 192: case 208: case 224:
+				addstr("=="); break;
 			default:
-				addstr("[]");
-				break; //ascii non-grouped
+				addstr("[]"); break; //top/bottom/mid
+			} //neighbours
+			break; //ascii semi-grouped
+		case 7:
+			switch (type & 240) {
+			case  16: addch(ACS_ULCORNER); addch(ACS_URCORNER); break;//top end
+			case  32: addch(ACS_LLCORNER); addch(ACS_LRCORNER); break;//bottom end
+			case  48: addch(ACS_VLINE); addch(ACS_VLINE); break;	//vertical middle
+			case  64: addch('['); addch(ACS_HLINE); break;		//left end
+			case  80: addch(ACS_ULCORNER); addch(ACS_TTEE); break;	//top left corner
+			case  96: addch(ACS_LLCORNER); addch(ACS_BTEE); break;	//bottom left corner
+			case 112: addch(ACS_LTEE); addch(ACS_PLUS); break;	//vertical+right
+			case 128: addch(ACS_HLINE); addch(']'); break;		//right end
+			case 144: addch(ACS_TTEE); addch(ACS_URCORNER); break;	//top right corner
+			case 160: addch(ACS_BTEE); addch(ACS_LRCORNER); break;	//bottom right corner
+			case 176: addch(ACS_PLUS); addch(ACS_RTEE); break;	//vertical+left
+			case 192: addch(ACS_HLINE); addch(ACS_HLINE); break;	//horizontal middle
+			case 208: addch(ACS_TTEE); addch(ACS_TTEE); break;	//horizontal+down
+			case 224: addch(ACS_BTEE); addch(ACS_BTEE); break;	//horizontal+up
+			default:  addstr("[]"); break;
+			} //neighbours
+			break; //curses grouped
+		default:
+			addstr("[]");
+			break; //ascii non-grouped
 		} //draw block
 #ifdef HAVE_NCURSES
 		if (Sets.standout) standend();
 #endif
 	} //display one brick
-} //PlotBlock1
-void PlotBlock1S(int y, int x, unsigned char type)
+}
+static void PlotBlock1S(int y, int x, unsigned char type)
 { //display block small
 	move(y, x);
 	if (type == BT_none) addch(' ');
@@ -496,21 +487,21 @@ void PlotBlock1S(int y, int x, unsigned char type)
 		if (Sets.standout) standend();
 #endif
 	} //display one brick
-} //PlotBlock1S
+}
 void PlotBlock(int scr, int y, int x, unsigned char type)
 {
-	if (y >= 0 && y < Players[scr].boardVisible &&
-		x >= 0 && x < Players[scr].boardWidth) {
-		if (boardSize[scr] > 1)
-			PlotBlock1(boardYPos[scr] - y, boardXPos[scr] + 2*x, type);
+	if (y >= 0 && y < Players[scr].boardVisible
+	 && x >= 0 && x < Players[scr].boardWidth) {
+		if (window[scr].size > 1)
+			PlotBlock1(window[scr].posy - y, window[scr].posx + 2*x, type);
 		else
-			PlotBlock1S(boardYPos[scr] - y, boardXPos[scr] + x, type);
+			PlotBlock1S(window[scr].posy - y, window[scr].posx + x, type);
 	} //on screen
-} //PlotBlock
+}
 void PlotBlockXY(int y, int x, unsigned char type)
 { //Draw block at specified position on screen (not on field)
 	PlotBlock1(20 - y, 2 * x, type);
-} //PlotBlock
+}
 
 void ShowScore(int scr, struct _Score score)
 { //show score stuff
@@ -518,8 +509,8 @@ void ShowScore(int scr, struct _Score score)
 
 	mvaddstr(13, statusXPos, MSG_NEXT " ");
 	mvaddstr(14, statusXPos + 5,  "        ");
-	ShapeIterate(Players[scr].nextShape, scr,
-		8, statusXPos/2 + (Players[scr].nextShape/4 == 5 ? 3 : 4),
+	ShapeIterate(Players[scr].nextShape, scr, 8,
+		statusXPos/2 + (Players[scr].nextShape/4 == 5 ? 3 : 4),
 		GlanceFunc); //draw; stick one more to the left
 	mvprintw(3, statusXPos, MSG_LEVEL, score.level);
 	mvprintw(5, statusXPos, MSG_SCORE, score.score);
@@ -537,24 +528,24 @@ void ShowScore(int scr, struct _Score score)
 		for (i = 7; i <= 10; i++)
 			mvaddstr(i, statusXPos, "             ");
 	} //too early to display stats, remove old..
-} //ShowScore
+}
 
 void FieldMessage(int playa, char *message)
 { //put a message over playa's field
-	if (!PlayerDisp[playa]) return;
+	if (!window[playa].shown) return;
 	if (message) {
 		char s[MAX_BOARD_WIDTH+1];
 		memset(s, ' ', MAX_BOARD_WIDTH);
-		memcpy(&s[(boardSize[playa] * Players[playa].boardWidth / 2) - (strlen(message) / 2)],
+		memcpy(&s[(window[playa].size * Players[playa].boardWidth / 2) - (strlen(message) / 2)],
 			message, strlen(message));
-		s[boardSize[playa] * Players[playa].boardWidth] = 0;
+		s[window[playa].size * Players[playa].boardWidth] = 0;
 #ifdef HAVE_NCURSES
 		attrset(A_REVERSE);
 #else
 		standout();
 #endif
-		mvprintw(boardYPos[playa] - Players[playa].boardVisible / 2,
-			boardXPos[playa], "%s", s);
+		mvprintw(window[playa].posy - Players[playa].boardVisible / 2,
+			window[playa].posx, "%s", s);
 		standend();
 	} //display
 	else {
@@ -563,47 +554,47 @@ void FieldMessage(int playa, char *message)
 		for (x = 0; x <= Players[playa].boardWidth; x++)
 			PlotBlock(playa, y, x, GetBlock(playa, y, x));
 	} //restore field
-} //FieldMessage
+}
 
 void ShowPause(int playa)
 { //put paused over player's field
 	if (Players[playa].alive > 0)
 		if (Players[playa].flags & SCF_paused)
 			if (Game.started > 1)
-				FieldMessage(playa, boardSize[playa] > 1 ? "P A U S E D" : "PAUSED");
+				FieldMessage(playa, window[playa].size > 1 ? "P A U S E D" : "PAUSED");
 			else
 				FieldMessage(playa,
-					boardSize[playa] > 1 ? "N O T  R E A D Y" : "NOT  READY");
+					window[playa].size > 1 ? "N O T  R E A D Y" : "NOT  READY");
 		else
 			if (Game.started > 1)
 				FieldMessage(playa, NULL);
 			else
-				FieldMessage(playa, boardSize[playa] > 1 ? "R E A D Y" : "READY");
+				FieldMessage(playa, window[playa].size > 1 ? "R E A D Y" : "READY");
 	else if (!Players[playa].alive)
 		FieldMessage(playa,
-			boardSize[playa] > 1 ? "G A M E  O V E R" : "GAME  OVER");
+			window[playa].size > 1 ? "G A M E  O V E R" : "GAME  OVER");
 	else
-		FieldMessage(playa, boardSize[playa] > 1 ? "E M P T Y" : "EMPTY");
-} //ShowPause
+		FieldMessage(playa, window[playa].size > 1 ? "E M P T Y" : "EMPTY");
+}
 
 
 void ShowTime(void)
 { //display timer
 	mvprintw(statusYPos, statusXPos, "timer %7.0f ", CurTimeval() / 1e6);
-} //ShowTime
+}
 
 void ScheduleFullRedraw(void)
 {
 	touchwin(stdscr);
-} //ScheduleFullRedraw
+}
 
-void CatchWinCh(int sig)
+static void CatchWinCh(int sig)
 { //handle window resize
-	endwin();    //exit curses
-	refresh();    //and reinit display (with different sizes)
+	endwin();      //exit curses
+	refresh();     //and reinit display (with different sizes)
 	InitFields();  //manually redraw everything
-	refresh();    //refresh
-} //CatchWinCh
+	refresh();     //refresh
+}
 
 static MyEventType KeyGenFunc(EventGenRec *gen, MyEvent *event)
 { //read keypresses
@@ -611,9 +602,5 @@ static MyEventType KeyGenFunc(EventGenRec *gen, MyEvent *event)
 		return E_key;
 	else
 		return E_none;
-} //KeyGenFunc
+}
 
-/*
- * vi: ts=4 ai
- * vim: noai si
- */