Registration now supports countries and clubs.

[ccbs] / bigscreen / top10scorescreen.cpp

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index 6ae58fd1d9d5c7b970253e9dc20be79a29434678..5e71bdd15704bf85b89b3d0b42b21f77425c02b0 100644 (file)
--- a/bigscreen/top10scorescreen.cpp
+++ b/bigscreen/top10scorescreen.cpp
@@ -1,6 +1,7 @@
 #include <cstdio>
 #include <algorithm>
 
+#include "resolution.h"
 #include "top10scorescreen.h"
 #include "fonts.h"
 
@@ -33,10 +34,11 @@ bool Top10ScoreScreen::check_invalidated()
        return false;
 }
 
-void Top10ScoreScreen::draw(unsigned char *buf)
+void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
        scores_changed.reset_flag();
-       memset(buf, 0, 800 * 600 * 4);
+       memset(buf, 0, width * height * 4);
+       set_screen_size(width, height);
 
        // fetch the top 10 scores
        std::vector<TopScore> scores;
@@ -44,12 +46,12 @@ void Top10ScoreScreen::draw(unsigned char *buf)
 
        {
                unsigned width = my_draw_text("Today's top 10 scores", NULL, 40.0);
-               my_draw_text("Today's top 10 scores", buf, 40.0, 800/2 - width/2, 60);
+               my_draw_text("Today's top 10 scores", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
        }
 
        // simple headings
        my_draw_text("Player", buf, 12.0, 70, 100);
-       my_draw_text("Song", buf, 12.0, 250, 100);
+       my_draw_text("Song", buf, 12.0, 370, 100);
        my_draw_text("Score", buf, 12.0, 710, 100);
        
        unsigned row = 1, y = 140;
@@ -68,10 +70,10 @@ void Top10ScoreScreen::draw(unsigned char *buf)
 
                my_draw_text(i->nick, buf, 24.0, 70, y, r, g, b);
 
-               if (my_draw_text(i->title, NULL, 24.0) > 430) {
-                       my_draw_text(i->shorttitle, buf, 24.0, 250, y, r, g, b);
+               if (my_draw_text(i->title, NULL, 24.0) > 320) {
+                       my_draw_text(i->shorttitle, buf, 24.0, 370, y, r, g, b);
                } else {
-                       my_draw_text(i->title, buf, 24.0, 250, y, r, g, b);
+                       my_draw_text(i->title, buf, 24.0, 370, y, r, g, b);
                }
                
                std::sprintf(str, "%u", i->score);