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);
}
}
// draw total
- {
+ if (num_scores > 1) {
char text[16];
std::sprintf(text, "%u", i->total);
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
*/
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;
}
}
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);
}
}
+/*
+ * 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)
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);
}
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);
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);
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);
projects / ccbs / blobdiff