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

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 6d38c4c..7b0175a 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -1,10 +1,11 @@
 #include <cstdio>
 #include <algorithm>
+#include <map>
 
 #include "groupscreen.h"
 #include "fetch_group.h"
-#include "fetch_max_score_for_song.h"
-#include "fetch_max_score_for_player.h"
+#include "fetch_max_score_for_songs.h"
+#include "fetch_max_score_for_players.h"
 #include "fetch_needs_update.h"
 #include "fetch_highscore.h"
 #include "fonts.h"
@@ -40,6 +41,14 @@ void GroupScreen::draw(unsigned char *buf)
 	
 	scores_changed.reset_flag();
 
+	/*
+	 * We'll probably need some values from here later on (although not all), just fetch them
+	 * all while we're at it.
+	 */
+	std::map<unsigned, unsigned> song_scores, player_scores;
+	conn.perform(FetchMaxScoreForSongs(tournament, &song_scores));
+	conn.perform(FetchMaxScoreForPlayers(tournament, round, &player_scores));
+	
 	Group group;
 	conn.perform(FetchGroup(tournament, round, parallel, &group));
 	gettimeofday(&last_updated, NULL);
@@ -203,8 +212,6 @@ void GroupScreen::draw(unsigned char *buf)
 	 * matter of sorting; the best attainable rank for player X is obtained if 
 	 * X gets max score and all others get min score, the worst attainable rank
 	 * is obtained if X gets min score and all others get max score.
-	 *
-	 * This is a bit SQL-heavy, but heck...
 	 */
 	std::vector<unsigned> max_score, min_score;
 	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
@@ -218,9 +225,9 @@ void GroupScreen::draw(unsigned char *buf)
 				unsigned max_score_this_song;
 				if (j->song.id != -1) {
 					// random song, or we know what song the player picked
-					conn.perform(FetchMaxScoreForSong(tournament, j->song.id, &max_score_this_song));
+					max_score_this_song = song_scores[j->song.id];
 				} else {
-					conn.perform(FetchMaxScoreForPlayer(tournament, i->id, round, &max_score_this_song));
+					max_score_this_song = player_scores[i->id];
 				}
 				max_score_tp += max_score_this_song;
 			}
@@ -350,9 +357,9 @@ void GroupScreen::draw(unsigned char *buf)
 			unsigned max_score_this_song;
 			if (next_song->song.id != -1) {
 				// random song, or we know what song the player picked
-				conn.perform(FetchMaxScoreForSong(tournament, next_song->song.id, &max_score_this_song));
+				max_score_this_song = song_scores[next_song->song.id];
 			} else {
-				conn.perform(FetchMaxScoreForPlayer(tournament, next_player->id, round, &max_score_this_song));
+				max_score_this_song = player_scores[next_player->id];
 			}
 
 			unsigned y = 520;