X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=a9251a316a0ed663ee9ec5d900c953ee25fa069b;hp=d163069f711105cb3bf6500156843a385d5b09e8;hb=bd55f6835567a11e5a490d4a872bc778c96d1e83;hpb=3db3afdf96b85a9eeaef00167b434b9ace23be17 diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index d163069..a9251a3 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -78,13 +78,15 @@ void GroupScreen::draw_column_headings(std::vector &td, const Group & 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 &td, const Group &group, const std::vector &colwidth) +void GroupScreen::draw_scores(std::vector &td, const Group &group, unsigned min_player, const std::vector &colwidth) { unsigned max_num_width = my_draw_text("8888", NULL, 22.0); unsigned num_scores = group.players[0].scores.size(); @@ -95,6 +97,8 @@ void GroupScreen::draw_scores(std::vector &td, const Group &group, co for (std::vector::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); @@ -124,7 +128,7 @@ void GroupScreen::draw_scores(std::vector &td, const Group &group, co } // draw total - { + if (num_scores > 1) { char text[16]; std::sprintf(text, "%u", i->total); @@ -181,8 +185,10 @@ void GroupScreen::find_column_widths(const Group &group, std::vector & 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 @@ -190,9 +196,13 @@ void GroupScreen::find_column_widths(const Group &group, std::vector & 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()); + } } /* @@ -276,15 +286,12 @@ void GroupScreen::draw_next_up_single(unsigned char *buf, const Group &group, */ 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; } } @@ -295,13 +302,19 @@ void GroupScreen::draw_next_up_single(unsigned char *buf, const Group &group, 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); @@ -524,7 +537,7 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co 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); @@ -547,6 +560,7 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co } 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); @@ -594,7 +608,30 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) 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(); @@ -641,11 +678,10 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) 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) @@ -665,11 +701,17 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) 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);