Only allocate space for four digits in the score screen -- if somebody actually gets...

[ccbs] / bigscreen / groupscreen.cpp

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 09c4389d17166848e3bb1c378aac900ceb5807f0..8432bbf321e66fbea4bc846b941856207a349594 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -27,41 +27,63 @@ void GroupScreen::draw(unsigned char *buf)
        conn.perform(FetchGroup(tournament, round, parallel, &group));
 
        memset(buf, 0, 800 * 600 * 4);
        conn.perform(FetchGroup(tournament, round, parallel, &group));
 
        memset(buf, 0, 800 * 600 * 4);

+
+       // main heading
+       char heading[64];
+       if (parallel == 0) {
+               sprintf(heading, "Round %u", round);
+       } else {
+               sprintf(heading, "Round %u, Group %u", round, parallel);
+       }
+
+       {
+               unsigned width = my_draw_text(heading, NULL, 48.0);
+               my_draw_text(heading, buf, 48.0, 800/2 - width/2, 60);
+       }

        
        // find out how wide each column has to be
        unsigned width[16];
        for (unsigned i = 0; i < 16; ++i)
                width[i] = 0;
 
        
        // find out how wide each column has to be
        unsigned width[16];
        for (unsigned i = 0; i < 16; ++i)
                width[i] = 0;
 

-       unsigned max_num_width = my_draw_text("88888", NULL, 22.0);
-
+       unsigned max_num_width = my_draw_text("8888", NULL, 22.0);

        for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
        for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {

+               unsigned col = 1;

                width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 18.0));
 
                width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 18.0));
 

-               unsigned col = 1;

                for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
                        if (j->chosen) {
                                width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 12.0) + 
                                                                  max_num_width + 10);
                        } else {                
                for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
                        if (j->chosen) {
                                width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 12.0) + 
                                                                  max_num_width + 10);
                        } else {                

-                               width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 12.0));
+                               width[col] = std::max(width[col], my_draw_text(j->song.short_title, NULL, 12.0));

                                width[col] = std::max(width[col], max_num_width);
                        }
                }
                                width[col] = std::max(width[col], max_num_width);
                        }
                }

-       }       
+       }
+
+       unsigned num_scores = group.players[0].scores.size();
+       
+       width[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
+       width[num_scores + 2] = my_draw_text("Rank", NULL, 12.0);

 
        // make column headings from the first player's songs
 
        // make column headings from the first player's songs

-       unsigned col = 1, x = 40 + width[0];
+       unsigned col = 1;
+       unsigned x = 40 + width[0];

        for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) {
                if (!i->chosen) {
        for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) {
                if (!i->chosen) {

-                       unsigned this_width = my_draw_text(i->song.title, NULL, 12.0);
-                       my_draw_text(i->song.title, buf, 12.0, x + width[col] / 2 - this_width / 2, 30);
+                       unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0);
+                       my_draw_text(i->song.short_title, buf, 12.0, x + width[col] / 2 - this_width / 2, 100);

                }
                x += width[col] + 20;
        }
                }
                x += width[col] + 20;
        }

+
+       my_draw_text("Total", buf, 12.0, x + width[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
+       x += width[num_scores + 1] + 20;
+       my_draw_text("Rank", buf, 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);

        
        // show all the players and the scores
        
        // show all the players and the scores

-       unsigned y = 70;
+       unsigned y = 140;

        for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
                my_draw_text(i->nick, buf, 18.0, 20, y);
 
        for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
                my_draw_text(i->nick, buf, 18.0, 20, y);