From b37186a18ef4c10cf13a5d44603f9d41a17e2883 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 23 Apr 2005 16:28:41 +0000 Subject: [PATCH] Fix so groups larger than nine are properly centered around the next player. --- bigscreen/groupscreen.cpp | 36 +++++++++++++++++++++++++++++++----- bigscreen/groupscreen.h | 2 +- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index c13c332..a9251a3 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -86,7 +86,7 @@ void GroupScreen::draw_column_headings(std::vector &td, const Group & } // 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(); @@ -97,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); @@ -606,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(); @@ -653,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) @@ -677,6 +701,8 @@ 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]; diff --git a/bigscreen/groupscreen.h b/bigscreen/groupscreen.h index d7b3761..7e905b6 100644 --- a/bigscreen/groupscreen.h +++ b/bigscreen/groupscreen.h @@ -24,7 +24,7 @@ private: unsigned get_show_players(const Group &group); void draw_main_heading(std::vector &td); void draw_column_headings(std::vector &td, const Group &group, const std::vector &colwidth); - void draw_scores(std::vector &td, const Group &group, const std::vector &colwidth); + void draw_scores(std::vector &td, const Group &group, unsigned min_player, const std::vector &colwidth); const Player *get_next_player(const Group &group); void draw_next_up_player(unsigned char *buf, const Group &group, const Player &player, const Score &song, bool last_song, std::map &song_scores, std::map &player_scores, -- 2.39.2