X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=750cec44ea9df56f17fb53a00c1f496218973338;hp=d163069f711105cb3bf6500156843a385d5b09e8;hb=79445f894ef099042925039c30fbd83c5b7fc9ea;hpb=3db3afdf96b85a9eeaef00167b434b9ace23be17

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index d163069..750cec4 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -78,8 +78,10 @@ void GroupScreen::draw_column_headings(std::vector<TextDefer> &td, const Group &
 		x += colwidth[col] + 20;
 	}
 
-	my_draw_text_deferred(td, "Total", 12.0, x + colwidth[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
-	x += colwidth[num_scores + 1] + 20;
+	if (num_scores > 1) {
+		my_draw_text_deferred(td, "Total", 12.0, x + colwidth[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
+		x += colwidth[num_scores + 1] + 20;
+	}
 	my_draw_text_deferred(td, "Rank", 12.0, x + colwidth[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
 }	
 	
@@ -124,7 +126,7 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, co
 		}
 
 		// draw total
-		{
+		if (num_scores > 1) {
 			char text[16];
 			std::sprintf(text, "%u", i->total);
 			
@@ -181,8 +183,10 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
 			colwidth.push_back(0);
 			colwidth.push_back(0);
 		}
-		
-		colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
+	
+		if (num_scores > 1) {
+			colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
+		}
 		colwidth[num_scores + 2] = my_draw_text("Rank", NULL, 12.0);
 
 		// if we're at long titles and that works, don't try the short ones
@@ -276,15 +280,12 @@ void GroupScreen::draw_next_up_single(unsigned char *buf, const Group &group,
 	 */
 	const Player *next_player = get_next_player(group);
 	const Score *next_song = NULL;
-	unsigned num_played = 0;  // will not always be completely accurate, but always as accurate as we need it :-)
 
 	for (unsigned i = 0; i < num_random_songs; ++i) {
 		unsigned j = (i + next_player->position - 1) % num_random_songs;
 		if (next_player->scores[j].score == -1) {
 			next_song = &(next_player->scores[j]);
 			break;
-		} else {
-			++num_played;
 		}
 	}
 
@@ -295,13 +296,19 @@ void GroupScreen::draw_next_up_single(unsigned char *buf, const Group &group,
 			if (next_player->scores[j].score == -1) {
 				next_song = &(next_player->scores[j]);
 				break;
-			} else {
-				++num_played;
 			}
 		}
 	}
 
 	if (next_song != NULL) {
+		// find out how many songs we've played in all
+		unsigned num_played = 0;
+		for (unsigned i = 0; i < num_scores; ++i) {
+			if (next_player->scores[i].score != -1) {
+				++num_played;
+			}
+		}
+	
 		bool last_song = (num_played == num_scores - 1);
 			
 		draw_next_up_player(buf, group, *next_player, *next_song, last_song, song_scores, player_scores, max_score, min_score);
@@ -524,7 +531,7 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
 		if (player.total + max_score_this_song > lead_beat && (lead_beat != win_beat)) {
 			int lead_need = std::max(lead_beat - player.total + 1, 0U);
 
-			if (lead_need > 0) {
+			if (lead_need > 1) {
 				text = widestring("Needs to lead: ") + widestring(pqxx::to_string(lead_need));
 				this_width = my_draw_text(text, NULL, 18.0);
 				my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
@@ -547,6 +554,7 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
 		}
 
 		if (group.num_qualifying > 0 &&
+		    group.num_qualifying != group.players.size() &&
 				player.total + max_score_this_song > unsigned(qualify_beat_worst_case) &&
 				(unsigned(qualify_beat_worst_case) != win_beat)) {
 			int qual_need = std::max(qualify_beat_worst_case - player.total + 1, 0U);
@@ -670,6 +678,10 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 		unsigned x = 40 + colwidth[0];
 		for (unsigned j = 1; j <= num_scores + 1; ++j)
 			x += colwidth[j] + 20;
+
+		// minor correction :-)
+		if (num_scores <= 1)
+			x -= 20;
 		
 		unsigned this_width = my_draw_text(text, NULL, 22.0);
 		my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 2] / 2 - this_width / 2, y);