X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=6d38c4cca58e45102a459ddb982a749d24c2deae;hp=96afeecb3363cd47ac8bec5a210e5064b163f562;hb=49d0231c7281caefc2ac919b2e2f872d2479a9e1;hpb=095c175c9d289b584cf4cb6d337fd9c491c0a887

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 96afeec..6d38c4c 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -49,9 +49,9 @@ void GroupScreen::draw(unsigned char *buf)
 	// main heading
 	char heading[64];
 	if (parallel == 0) {
-		sprintf(heading, "Round %u", round);
+		std::sprintf(heading, "Round %u", round);
 	} else {
-		sprintf(heading, "Round %u, Group %u", round, parallel);
+		std::sprintf(heading, "Round %u, Group %u", round, parallel);
 	}
 
 	{
@@ -115,7 +115,6 @@ void GroupScreen::draw(unsigned char *buf)
 		}
 
 		if (first_chosen_col != -1) {
-			printf("first_chosen_col=%u\n", first_chosen_col);
 			width[first_chosen_col] += 780 - sumwidth;
 		}
 	}
@@ -136,8 +135,11 @@ void GroupScreen::draw(unsigned char *buf)
 	my_draw_text_deferred(td, "Rank", 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
 	
 	// show all the players and the scores
-	unsigned y = 140;
-	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+	unsigned show_players = std::min(group.players.size(), 9U);
+	unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
+	
+	unsigned row = 0;
+	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i, ++row) {
 		my_draw_text_deferred(td, i->nick, 18.0, 20, y);
 
 		unsigned x = 40 + width[0];
@@ -146,7 +148,7 @@ void GroupScreen::draw(unsigned char *buf)
 		for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
 			char text[16] = "";
 			if (j->score != -1) {
-				sprintf(text, "%u", j->score);
+				std::sprintf(text, "%u", j->score);
 			}
 	
 			unsigned this_width = my_draw_text(text, NULL, 22.0);
@@ -168,14 +170,17 @@ void GroupScreen::draw(unsigned char *buf)
 		// draw total
 		{
 			char text[16];
-			sprintf(text, "%u", i->total);
+			std::sprintf(text, "%u", i->total);
 			
 			unsigned this_width = my_draw_text(text, NULL, 22.0);
 			my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 1] / 2 - this_width / 2, y);
 			x += width[num_scores + 1] + 20;
 		}
 
-		y += 40;
+		if (show_players > 7)
+			y += 40 - (show_players - 7) * 4;
+		else 
+			y += 40;
 	}
 	
 	/*
@@ -225,8 +230,8 @@ void GroupScreen::draw(unsigned char *buf)
 	}
 
 	// now finally find min and max rank, and draw it all
-	y = 140;
-	for (unsigned i = 0; i < group.players.size(); ++i) {
+	y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
+	for (unsigned i = 0; i < show_players; ++i) {
 		unsigned best_rank = 1, worst_rank = 1;
 		for (unsigned j = 0; j < group.players.size(); ++j) {
 			if (i == j)
@@ -247,7 +252,10 @@ void GroupScreen::draw(unsigned char *buf)
 		unsigned this_width = my_draw_text(text, NULL, 22.0);
 		my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y);
 
-		y += 40;
+		if (show_players > 7)
+			y += 40 - (show_players - 7) * 4;
+		else 
+			y += 40;
 	}
 		
 	/*
@@ -295,7 +303,6 @@ void GroupScreen::draw(unsigned char *buf)
 		unsigned j = (i + next_player->position - 1) % num_random_songs;
 		if (next_player->scores[j].score == -1) {
 			next_song = &(next_player->scores[j]);
-			printf("Selecting score %u\n", j);
 			break;
 		}
 	}
@@ -306,7 +313,6 @@ void GroupScreen::draw(unsigned char *buf)
 			unsigned j = (i + next_player->position) % num_scores;
 			if (next_player->scores[j].score == -1) {
 				next_song = &(next_player->scores[j]);
-				printf("Selecting score %u\n", j);
 				break;
 			}
 		}