DDR Europe tournament parser now by default sets all players to Norway. Syntax fixes...

[ccbs] / bigscreen / top10scorescreen.cpp

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index 791c785ec61b4fc0fd30bb5db1bc39a2c6cd809f..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"
 
@@ -20,13 +21,24 @@ bool Top10ScoreScreen::check_invalidated()
        if (!scores_changed.get_flag())
                return false;
 
-       return true;
+       // check that there are indeed changes, otherwise don't bother
+       std::vector<TopScore> scores;
+       conn.perform(FetchTopScoresForTournament(tournament, 10, &scores));
+       
+       for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
+               if (seen_topscore.count(*i) == 0) {
+                       return true;
+               }
+       }
+       
+       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;
@@ -34,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;
@@ -58,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);
@@ -77,3 +89,7 @@ void Top10ScoreScreen::draw(unsigned char *buf)
        std::copy(scores.begin(), scores.end(), std::inserter(seen_topscore, seen_topscore.end()));
 }
 
+int Top10ScoreScreen::get_priority()
+{
+       return 5;
+}