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);
}
// show all the players and the scores
-void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, const std::vector<unsigned> &colwidth)
+void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, unsigned min_player, const std::vector<unsigned> &colwidth)
{
unsigned max_num_width = my_draw_text("8888", NULL, 22.0);
unsigned num_scores = group.players[0].scores.size();
for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i) {
if (m++ % num_machines != machine)
continue;
+ if (m-1 < min_player)
+ continue;
my_draw_text_deferred(td, i->nick, 18.0, 20, y);
}
// 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
for (unsigned i = 0; i <= num_scores + 2; ++i)
sumcolwidth += colwidth[i] + 20;
-
+
if (sumcolwidth < 780)
break;
+
+ if (mode == 0) {
+ colwidth.erase(colwidth.begin(), colwidth.end());
+ }
}
/*
*/
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);
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);
draw_main_heading(td);
find_column_widths(group, colwidth);
draw_column_headings(td, group, colwidth);
- draw_scores(td, group, colwidth);
+
+ // Find out which player is next. we want to show SHOW_PLAYERS players, centered
+ // around this as much as possible. (Usually, this will mean all, but not always.)
+ unsigned show_players = get_show_players(group);
+ const Player *center_player = get_next_player(group);
+
+ // find the index (kind of backwards...)
+ int player_index = -1;
+ for (unsigned i = 0; i < group.players.size(); ++i) {
+ if (&(group.players[i]) == center_player) {
+ player_index = i;
+ break;
+ }
+ }
+
+ assert(player_index >= 0);
+
+ int min_player = player_index - signed(show_players) / 2;
+ if (min_player + show_players > group.players.size()) // FIXME: songs_per_machine
+ min_player = group.players.size() - show_players;
+ if (min_player < 0)
+ min_player = 0;
+
+ draw_scores(td, group, min_player, colwidth);
unsigned num_scores = group.players[0].scores.size();
max_score.push_back(max_score_tp);
min_score.push_back(min_score_tp);
}
-
+
// now finally find min and max rank, and draw it all
- unsigned show_players = get_show_players(group);
unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
- for (unsigned i = 0; i < group.players.size() && (i/num_machines) < show_players; ++i) {
+ for (unsigned i = 0; i < group.players.size() && (i/num_machines) < show_players+min_player; ++i) {
unsigned best_rank = 1, worst_rank = 1;
for (unsigned j = 0; j < group.players.size(); ++j) {
if (i == j)
if (i % num_machines != machine)
continue;
+ if (signed(i) < min_player)
+ continue;
// find out where to place this
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);
projects / ccbs / blobdiff