X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/01aff5930cdf4448ad3fbdb8821d6708402faedd..50f893f330ff111a802bcfd1822ee11ff8a1754e:/curses.c

diff --git a/curses.c b/curses.c
index 57bfee7..4571bc2 100644
--- a/curses.c
+++ b/curses.c
@@ -403,8 +403,7 @@ static void block_draw_2(int y, int x, unsigned char type)
 	else {
 #ifdef HAVE_NCURSES
 		if (Sets.standout) {
-			if (haveColor) attrset(COLOR_PAIR(type & 15));
-			else attrset(A_REVERSE);
+			attrset(haveColor ? COLOR_PAIR(type & 15) : A_REVERSE);
 		}
 #endif
 		switch (Sets.drawstyle) {
@@ -419,24 +418,6 @@ static void block_draw_2(int y, int x, unsigned char type)
 			} //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
@@ -471,13 +452,11 @@ static void block_draw_1(int y, int x, unsigned char type)
 	if (type == BT_none) addch(' ');
 	else if (type == BT_shadow) addch(':');
 	else {
-		if (Sets.standout) {
 #ifdef HAVE_NCURSES
-			if (haveColor)
-				attrset(COLOR_PAIR(type & 15));
-			else attrset(A_REVERSE);
-#endif
+		if (Sets.standout) {
+			attrset(haveColor ? COLOR_PAIR(type & 15) : A_REVERSE);
 		}
+#endif
 		if ((type & 192) == 64)
 			addch('[');
 		else if ((type & 192) == 128)
@@ -536,11 +515,13 @@ void window_msg(int player, char *message)
 { //put a message over player's field
 	if (!window[player].shown) return;
 	if (message) {
-		char s[MAX_BOARD_WIDTH+1];
-		memset(s, ' ', MAX_BOARD_WIDTH);
-		memcpy(&s[(window[player].size * Players[player].boardWidth / 2) - (strlen(message) / 2)],
-			message, strlen(message));
-		s[window[player].size * Players[player].boardWidth] = 0;
+		const int fieldsize = Players[player].boardWidth * window[player].size;
+		const int centered = (fieldsize - strlen(message)) / 2;
+		char s[fieldsize + 1];
+
+		memset(s, ' ', fieldsize);
+		memcpy(&s[centered], message, strlen(message));
+		s[fieldsize] = 0;
 #ifdef HAVE_NCURSES
 		attrset(A_REVERSE);
 #else
@@ -597,24 +578,24 @@ void window_msg_status(int player)
 	if (Players[player].alive > 0)
 		if (Players[player].flags & SCF_paused)
 			if (Game.started > 1)
-				window_msg_wide(player, "PAUSED");
+				window_msg_wide(player, MSG_PLAYER_PAUSE);
 			else
-				window_msg_wide(player, "NOT READY");
+				window_msg_wide(player, MSG_PLAYER_JOIN);
 		else
 			if (Game.started > 1)
 				window_msg(player, NULL);
 			else
-				window_msg_wide(player, "READY");
+				window_msg_wide(player, MSG_PLAYER_START);
 	else if (!Players[player].alive)
-		window_msg_wide(player, "GAME OVER");
+		window_msg_wide(player, MSG_PLAYER_STOP);
 	else
-		window_msg_wide(player, "EMPTY");
+		window_msg_wide(player, MSG_PLAYER_PART);
 }
 
 
 void status_tick(void)
 { //display timer
-	mvprintw(statusYPos, statusXPos, "timer %7.0f ", CurTimeval() / 1e6);
+	mvprintw(statusYPos, statusXPos, MSG_TIME, CurTimeval() / 1e6);
 }
 
 void ScheduleFullRedraw(void)