X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=9f3b17c521eac7ff9c42b406a7511cfd0839ba0c;hp=ab3ca54a8d36e6eb8ec37527d99a88583f4d11e1;hb=7b8b747f037d2244ffd080e97d9d5e5c0e9114a7;hpb=c9cf3358a292d988d5d50819bb2db4da3347284a

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index ab3ca54..9f3b17c 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -420,12 +420,12 @@ void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group,
 	
 	// OK, we have two players. Draw their nicks and the scores
 	widestring text = widestring("Next players: ") + next_player->nick + widestring(" and ") + other_player->nick;
-	unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo");
-	my_draw_text(text, buf, 24.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420);
+	unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo.player");
+	my_draw_text(text, buf, 24.0, "nextsonginfo.player", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420);
 
 	if (next_song->song.id != -1) {
-		this_width = my_draw_text(next_song->song.title, NULL, 20.0, "nextsongtitle");
-		my_draw_text(next_song->song.title, buf, 20.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
+		this_width = my_draw_text(next_song->song.title, NULL, 20.0, "nextsonginfo.title");
+		my_draw_text(next_song->song.title, buf, 20.0, "nextsonginfo.title", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
 
 		Highscore hs;
 		conn.perform(FetchHighscore(next_song->song.id, &hs));
@@ -433,8 +433,8 @@ void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group,
 		if (hs.score != -1) {
 			text = widestring("High score: ") + widestring(pqxx::to_string(hs.score)) +
 				widestring(", by ") + hs.nick + widestring(" in ") + hs.tournament_name;
-			this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo");
-			my_draw_text(text, buf, 16.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
+			this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo.highscore");
+			my_draw_text(text, buf, 16.0, "nextsonginfo.highscore", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
 		}
 	}
 }
@@ -444,12 +444,12 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
 	const std::vector<unsigned> &max_score, const std::vector<unsigned> &min_score)
 {
 	widestring text = widestring("Next player: ") + player.nick;
-	unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo");
-	my_draw_text(text, buf, 24.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420);
+	unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo.player");
+	my_draw_text(text, buf, 24.0, "nextsonginfo.player", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420);
 
 	if (song.song.id != -1) {
-		this_width = my_draw_text(song.song.title, NULL, 20.0, "nextsonginfo");
-		my_draw_text(song.song.title, buf, 20.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
+		this_width = my_draw_text(song.song.title, NULL, 20.0, "nextsonginfo.title");
+		my_draw_text(song.song.title, buf, 20.0, "nextsonginfo.title", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
 
 		Highscore hs;
 		conn.perform(FetchHighscore(song.song.id, &hs));
@@ -457,8 +457,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
 		if (hs.score != -1) {
 			text = widestring("High score: ") + widestring(pqxx::to_string(hs.score)) +
 				widestring(", by ") + hs.nick + widestring(" in ") + hs.tournament_name;
-			this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo");
-			my_draw_text(text, buf, 16.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
+			this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo.highscore");
+			my_draw_text(text, buf, 16.0, "nextsonginfo.highscore", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
 		}
 	}
 
@@ -534,7 +534,11 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
 				tmp.push_back(max_score[i]);
 			}
 			std::sort(tmp.begin(), tmp.end());
-			qualify_beat_worst_case = tmp[tmp.size() - group.num_qualifying];
+			if (tmp.size() > group.num_qualifying) {
+				qualify_beat_worst_case = tmp[tmp.size() - group.num_qualifying];
+			} else {
+				qualify_beat_worst_case = 0;
+			}
 
 			std::vector<unsigned> tmp2;
 			for (unsigned i = 0; i < group.players.size(); ++i) {
@@ -544,7 +548,11 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
 			}
 
 			std::sort(tmp2.begin(), tmp2.end());
-			qualify_beat_best_case = tmp2[tmp2.size() - group.num_qualifying];
+			if (tmp2.size() > group.num_qualifying) {
+				qualify_beat_best_case = tmp2[tmp2.size() - group.num_qualifying];
+			} else {
+				qualify_beat_best_case = 0;
+			}
 		}
 
 		// print out the lines we can attain