X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=d163069f711105cb3bf6500156843a385d5b09e8;hp=219660ae71a9e6d91d41ec772f5f1f9ed42b2482;hb=3db3afdf96b85a9eeaef00167b434b9ace23be17;hpb=8e632531fde7c8197a7cdba1842838fa50a44626

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 219660a..d163069 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -308,6 +308,110 @@ void GroupScreen::draw_next_up_single(unsigned char *buf, const Group &group,
 	}
 }
 
+/*
+ * Some tournaments allow versus play in the initial rounds to save time; this is
+ * of course for random songs only. In this case, the scheme from draw_next_up_single()
+ * is somewhat changed, as we zig-zag across pairs instead of players. (If there's a
+ * stray person left in the group, that player plays the song by him-/herself as in
+ * a usual single tournament.
+ */
+void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group,
+	std::map<unsigned, unsigned> &song_scores, std::map<unsigned, unsigned> &player_scores,
+	const std::vector<unsigned> &max_score, const std::vector<unsigned> &min_score)
+{
+	// Find out how many random songs there are (equal for all players).
+	unsigned num_random_songs = 0;
+	for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i) {
+		if (!i->chosen)
+			++num_random_songs;
+	}
+
+	// Find the next player and what song he/she is supposed to play, if any.
+	const Player *next_player = get_next_player(group);
+	const Score *next_song = NULL;
+	unsigned song_num;
+
+	for (unsigned i = 0; i < num_random_songs; ++i) {
+		unsigned j = (i + (next_player->position - 1) / 2) % num_random_songs;
+		if (next_player->scores[j].score == -1) {
+			next_song = &(next_player->scores[j]);
+			song_num = j;
+			break;
+		}
+	}
+	
+	/*
+	 * If there's no match, we're on the chosen songs (or done),
+	 * so just delegate to draw_up_single().
+	 */
+	if (next_song == NULL) {
+		draw_next_up_single(buf, group, song_scores, player_scores, max_score, min_score);
+		return;
+	}
+	
+	/*
+	 * Look for a player with the same amount of random songs played _and_ missing
+	 * the same song.
+	 */ 
+	unsigned num_songs_played = 0;
+	for (unsigned i = 0; i < num_random_songs; ++i) {
+		if (next_player->scores[i].score != -1) {
+			++num_songs_played;
+		}
+	}
+	
+	unsigned m = 0;
+	const Player *other_player = NULL;
+	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+		if ((m++ % num_machines != machine))
+			continue;
+		if (i->id == next_player->id)
+			continue;
+		
+		unsigned this_songs_played = 0;
+		for (unsigned j = 0; j < num_random_songs; ++j) {
+			if (i->scores[j].score != -1) {
+				++this_songs_played;
+			}
+		}
+
+		if (this_songs_played != num_songs_played)
+			continue;
+
+		if (i->scores[song_num].score == -1) {
+			other_player = &(*i);
+			break;
+		}	
+	}
+
+	// If we didn't find another player, just draw the one we have as usual.
+	if (other_player == NULL) {
+		draw_next_up_player(buf, group, *next_player, *next_song, false,
+			song_scores, player_scores, max_score, min_score);
+		return;
+	}
+	
+	// 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);
+	my_draw_text(text, buf, 24.0, (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);
+		my_draw_text(next_song->song.title, buf, 20.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
+
+		Highscore hs;
+		conn.perform(FetchHighscore(next_song->song.id, &hs));
+
+		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);
+			my_draw_text(text, buf, 16.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
+		}
+	}
+}
+
 void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, const Player &player, const Score &song, bool last_song,
 	std::map<unsigned, unsigned> &song_scores, std::map<unsigned, unsigned> &player_scores,
 	const std::vector<unsigned> &max_score, const std::vector<unsigned> &min_score)
@@ -575,8 +679,11 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 		else 
 			y += 40;
 	}
-	
-	draw_next_up_single(buf, group, song_scores, player_scores, max_score, min_score);
+
+	if (players_per_machine == 2)
+		draw_next_up_versus(buf, group, song_scores, player_scores, max_score, min_score);
+	else 
+		draw_next_up_single(buf, group, song_scores, player_scores, max_score, min_score);
 	
 	valid = true;
 	draw_all_deferred_text(buf, td, last_text);