Fix so groups larger than nine are properly centered around the next player.

[ccbs] / bigscreen / groupscreen.cpp

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index c13c3325ffb821e39335c4527bbeb83ecbc206b8..a9251a316a0ed663ee9ec5d900c953ee25fa069b 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -86,7 +86,7 @@ void GroupScreen::draw_column_headings(std::vector<TextDefer> &td, const Group &
 }      
        
 // 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();
@@ -97,6 +97,8 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, co
        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);
 
@@ -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];