X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/bed729727d8fef3695e5252f17cfbbe8f2aca879..984fd4a002cd31854730b24ba70c447b165f4d15:/curses.c

diff --git a/curses.c b/curses.c
index 98465b6..0e841ef 100644
--- a/curses.c
+++ b/curses.c
@@ -220,7 +220,7 @@ static void DrawTitle(void)
 	standend();	//normal text
 }
 
-void DrawBox(int x1, int y1, int x2, int y2)
+static void window_border(int x1, int y1, int x2, int y2)
 { //draw grid
 	int y, x;
 
@@ -240,38 +240,38 @@ void DrawBox(int x1, int y1, int x2, int y2)
 	addch(Sets.ascii ? '+' : ACS_LRCORNER);
 }
 
-void DrawField(int scr)
-{ //draw field for player scr
-	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);
+void window_draw(int player)
+{ //draw field for player
+	if (!window[player].shown) return; 
+	window_border(window[player].posx - 1, window[player].posy - Players[player].boardVisible,
+		window[player].posx + window[player].size * Players[player].boardWidth, window[player].posy + 1);
 	{
-		char s[window[scr].size * Players[scr].boardWidth + 1];
+		char s[window[player].size * Players[player].boardWidth + 1];
 
-		if (Players[scr].host && Players[scr].host[0])
+		if (Players[player].host && Players[player].host[0])
 			snprintf(s, sizeof(s), " %s <%s> ",
-				Players[scr].name, Players[scr].host);
-		else snprintf(s, sizeof(s), " %s ", Players[scr].name);
+				Players[player].name, Players[player].host);
+		else snprintf(s, sizeof(s), " %s ", Players[player].name);
 		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, window[scr].posx, s);
+		if (haveColor && Players[player].team > 0 && Players[player].team <= 7)
+			attrset(A_REVERSE | COLOR_PAIR(Players[player].team + 1));
+		mvaddstr(1, window[player].posx, s);
 		if (haveColor) standend();
 	} //display playername/host
 
 	{
 		int x, y;
-		for (y = 0; y <= Players[scr].boardVisible; y++)
-			for (x = 0; x <= Players[scr].boardWidth; x++)
-				PlotBlock(scr, y, x, GetBlock(scr, y, x));
+		for (y = 0; y <= Players[player].boardVisible; y++)
+			for (x = 0; x <= Players[player].boardWidth; x++)
+				block_draw_window(player, y, x, block_get(player, y, x));
 	} //draw field
 
-	ShowPause(scr);
+	window_msg_status(player);
 }
 
-void InitFields(void)
+void screen_setup(void)
 { //calculate positions of all fields
-	int scr, prevscr;
+	int i, prev;
 	int y, x;
 	int spaceavail;
 
@@ -284,7 +284,7 @@ void InitFields(void)
 	window[me].shown = 1;
 	statusXPos = window[me].size * Players[me].boardWidth + 3;
 	statusYPos = 21;
-	ShowScore(me, Players[me].score);
+	status_draw(me, Players[me].score);
 
 	messageXPos = 2;
 	messageYPos = 24;
@@ -296,46 +296,46 @@ void InitFields(void)
 		messageXPos = statusXPos + 16;
 		messageYPos = 2;
 	} //messagebox doesn't fit below
-	DrawBox(messageXPos - 2, messageYPos - 1,
+	window_border(messageXPos - 2, messageYPos - 1,
 		messageXPos + messageWidth + 1, messageYPos+messageHeight);
 	if (msgwin = subwin(stdscr, messageHeight, messageWidth,
 	                    messageYPos, messageXPos))
 		scrollok(msgwin, 1);  //allow scrolling
 	wmove(msgwin, messageHeight - 2, 0);
-	for (scr = messageHeight - 2; scr >= 0; scr--) //display message history
-		DisplayMessage(message[scr]);
+	for (i = messageHeight - 2; i >= 0; i--) //display message history
+		msg_draw(message[i]);
 
 	spaceavail = x;
-	for (scr = 1; scr <= maxPlayer; scr++)
-		spaceavail -= Players[scr].boardWidth+2;
-	prevscr = me;
-	for (scr = 1; scr < MAX_SCREENS; scr++) if (scr != me) {
-		window[scr].posy = 21;
-		window[scr].posx =
-			window[prevscr].posx + 2 + window[prevscr].size * Players[prevscr].boardWidth;
-		if (prevscr == me) {
-			window[scr].posx += 15; //scorebar
+	for (i = 1; i <= maxPlayer; i++)
+		spaceavail -= Players[i].boardWidth+2;
+	prev = me;
+	for (i = 1; i < MAX_SCREENS; i++) if (i != me) {
+		window[i].posy = 21;
+		window[i].posx =
+			window[prev].posx + 2 + window[prev].size * Players[prev].boardWidth;
+		if (prev == me) {
+			window[i].posx += 15; //scorebar
 			if (messageYPos < 24)
-				window[scr].posx += messageWidth + 4; //messagebox
-			spaceavail -= window[scr].posx - 3;
+				window[i].posx += messageWidth + 4; //messagebox
+			spaceavail -= window[i].posx - 3;
 		} //stuff before second player
 		if (spaceavail >= 0) {
-			window[scr].size = 2;
-			spaceavail -= Players[scr].boardWidth;
+			window[i].size = 2;
+			spaceavail -= Players[i].boardWidth;
 		} //not enough space, half width
 		else
-			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
+			window[i].size = 1;
+		if (x < window[i].posx + 1 + window[i].size * Players[i].boardWidth)
+			window[i].shown = 0; //field doesn't fit on screen
 		else
-			window[scr].shown = 1;
-		prevscr = scr;
+			window[i].shown = 1;
+		prev = i;
 	}
-	for (scr = 1; scr <= maxPlayer; scr++)
-		DrawField(scr);
+	for (i = 1; i <= maxPlayer; i++)
+		window_draw(i);
 }
 
-static void DisplayMessage(char *p)
+static void msg_draw(char *p)
 {
 	char s[MSG_WIDTH];
 	char *psearch;
@@ -356,7 +356,7 @@ static void DisplayMessage(char *p)
 	waddch(msgwin, '\n');
 }
 
-void Message(char *fmt, ...)
+void msg_add(char *fmt, ...)
 { //print game/bot message
 	va_list args;
 	char s[MSG_WIDTH];
@@ -374,12 +374,12 @@ void Message(char *fmt, ...)
 	strcpy(p, s);
 
 	wmove(msgwin, messageHeight - 1, 0);
-	DisplayMessage(s);
+	msg_draw(s);
 	wclrtoeol(msgwin);
 	wrefresh(msgwin);
 }
 
-void Messagetype(char c, int x, char *s)
+void msg_add_char(char c, int x, char *s)
 { //show single typed character
 	if (c == 27) {
 		mvwaddch(msgwin, messageHeight-1, (x+1) % (messageWidth-1), ' ');
@@ -395,7 +395,7 @@ void Messagetype(char c, int x, char *s)
 	wrefresh(msgwin);
 }
 
-static void PlotBlock1(int y, int x, unsigned char type)
+static void block_draw_2(int y, int x, unsigned char type)
 { //display block on screen
 	move(y, x);
 	if (type == BT_none) addstr("  ");
@@ -464,7 +464,8 @@ static void PlotBlock1(int y, int x, unsigned char type)
 #endif
 	} //display one brick
 }
-static void PlotBlock1S(int y, int x, unsigned char type)
+
+static void block_draw_1(int y, int x, unsigned char type)
 { //display block small
 	move(y, x);
 	if (type == BT_none) addch(' ');
@@ -488,30 +489,31 @@ static void PlotBlock1S(int y, int x, unsigned char type)
 #endif
 	} //display one brick
 }
-void PlotBlock(int scr, int y, int x, unsigned char type)
+
+void block_draw_window(int player, int y, int x, unsigned char 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);
+	if (y >= 0 && y < Players[player].boardVisible
+	 && x >= 0 && x < Players[player].boardWidth) {
+		if (window[player].size > 1)
+			block_draw_2(window[player].posy - y, window[player].posx + 2*x, type);
 		else
-			PlotBlock1S(window[scr].posy - y, window[scr].posx + x, type);
+			block_draw_1(window[player].posy - y, window[player].posx + x, type);
 	} //on screen
 }
-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);
+void block_draw_status(int y, int x, unsigned char type)
+{ //Draw block at specified position next to field
+	block_draw_2(20 - y, 2 * x, type);
 }
 
-void ShowScore(int scr, struct _Score score)
+void status_draw(int player, struct score_t score)
 { //show score stuff
 	float timer;
 
 	mvaddstr(13, statusXPos, MSG_NEXT " ");
 	mvaddstr(14, statusXPos + 5,  "        ");
-	ShapeIterate(Players[scr].nextShape, scr, 8,
-		statusXPos/2 + (Players[scr].nextShape/4 == 5 ? 3 : 4),
-		GlanceFunc); //draw; stick one more to the left
+	shape_iterate(Players[player].nextShape, player, 8,
+		statusXPos/2 + (Players[player].nextShape/4 == 5 ? 3 : 4),
+		block_iter_set_status); //draw; BT_I one more to the left
 	mvprintw(3, statusXPos, MSG_LEVEL, score.level);
 	mvprintw(5, statusXPos, MSG_SCORE, score.score);
 	mvprintw(6, statusXPos, MSG_LINES, score.lines);
@@ -530,55 +532,55 @@ void ShowScore(int scr, struct _Score score)
 	} //too early to display stats, remove old..
 }
 
-void FieldMessage(int playa, char *message)
-{ //put a message over playa's field
-	if (!window[playa].shown) return;
+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[playa].size * Players[playa].boardWidth / 2) - (strlen(message) / 2)],
+		memcpy(&s[(window[player].size * Players[player].boardWidth / 2) - (strlen(message) / 2)],
 			message, strlen(message));
-		s[window[playa].size * Players[playa].boardWidth] = 0;
+		s[window[player].size * Players[player].boardWidth] = 0;
 #ifdef HAVE_NCURSES
 		attrset(A_REVERSE);
 #else
 		standout();
 #endif
-		mvprintw(window[playa].posy - Players[playa].boardVisible / 2,
-			window[playa].posx, "%s", s);
+		mvprintw(window[player].posy - Players[player].boardVisible / 2,
+			window[player].posx, "%s", s);
 		standend();
 	} //display
 	else {
 		int x, y;
-		y = Players[playa].boardVisible / 2;
-		for (x = 0; x <= Players[playa].boardWidth; x++)
-			PlotBlock(playa, y, x, GetBlock(playa, y, x));
+		y = Players[player].boardVisible / 2;
+		for (x = 0; x <= Players[player].boardWidth; x++)
+			block_draw_window(player, y, x, block_get(player, y, x));
 	} //restore field
 }
 
-void ShowPause(int playa)
-{ //put paused over player's field
-	if (Players[playa].alive > 0)
-		if (Players[playa].flags & SCF_paused)
+void window_msg_status(int player)
+{ //put status (pause, readiness, game over) over player's field
+	if (Players[player].alive > 0)
+		if (Players[player].flags & SCF_paused)
 			if (Game.started > 1)
-				FieldMessage(playa, window[playa].size > 1 ? "P A U S E D" : "PAUSED");
+				window_msg(player, window[player].size > 1 ? "P A U S E D" : "PAUSED");
 			else
-				FieldMessage(playa,
-					window[playa].size > 1 ? "N O T  R E A D Y" : "NOT  READY");
+				window_msg(player,
+					window[player].size > 1 ? "N O T  R E A D Y" : "NOT  READY");
 		else
 			if (Game.started > 1)
-				FieldMessage(playa, NULL);
+				window_msg(player, NULL);
 			else
-				FieldMessage(playa, window[playa].size > 1 ? "R E A D Y" : "READY");
-	else if (!Players[playa].alive)
-		FieldMessage(playa,
-			window[playa].size > 1 ? "G A M E  O V E R" : "GAME  OVER");
+				window_msg(player, window[player].size > 1 ? "R E A D Y" : "READY");
+	else if (!Players[player].alive)
+		window_msg(player,
+			window[player].size > 1 ? "G A M E  O V E R" : "GAME  OVER");
 	else
-		FieldMessage(playa, window[playa].size > 1 ? "E M P T Y" : "EMPTY");
+		window_msg(player, window[player].size > 1 ? "E M P T Y" : "EMPTY");
 }
 
 
-void ShowTime(void)
+void status_tick(void)
 { //display timer
 	mvprintw(statusYPos, statusXPos, "timer %7.0f ", CurTimeval() / 1e6);
 }
@@ -592,7 +594,7 @@ static void CatchWinCh(int sig)
 { //handle window resize
 	endwin();      //exit curses
 	refresh();     //and reinit display (with different sizes)
-	InitFields();  //manually redraw everything
+	screen_setup();//manually redraw everything
 	refresh();     //refresh
 }