Replace 800x600 width a resolution from a .h file. Lots of positions are still hardco...

[ccbs] / bigscreen / top10scorescreen.cpp

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index 791c785ec61b4fc0fd30bb5db1bc39a2c6cd809f..d4453d84a5b90dcece0c8425e4229683d14bd9c9 100644 (file)
--- a/bigscreen/top10scorescreen.cpp
+++ b/bigscreen/top10scorescreen.cpp
@@ -1,6 +1,7 @@
 #include <cstdio>
 #include <algorithm>
 
 #include <cstdio>
 #include <algorithm>
 

+#include "resolution.h"

 #include "top10scorescreen.h"
 #include "fonts.h"
 
 #include "top10scorescreen.h"
 #include "fonts.h"
 


@@ -20,13 +21,23 @@ bool Top10ScoreScreen::check_invalidated()
        if (!scores_changed.get_flag())
                return false;
 
        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)
 {
        scores_changed.reset_flag();
 }
 
 void Top10ScoreScreen::draw(unsigned char *buf)
 {
        scores_changed.reset_flag();

-       memset(buf, 0, 800 * 600 * 4);
+       memset(buf, 0, SCREEN_WIDTH * SCREEN_HEIGHT * 4);

 
        // fetch the top 10 scores
        std::vector<TopScore> scores;
 
        // fetch the top 10 scores
        std::vector<TopScore> scores;


@@ -34,7 +45,7 @@ void Top10ScoreScreen::draw(unsigned char *buf)
 
        {
                unsigned width = my_draw_text("Today's top 10 scores", NULL, 40.0);
 
        {
                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, SCREEN_WIDTH/2 - width/2, 60);

        }
 
        // simple headings
        }
 
        // simple headings


@@ -77,3 +88,7 @@ void Top10ScoreScreen::draw(unsigned char *buf)
        std::copy(scores.begin(), scores.end(), std::inserter(seen_topscore, seen_topscore.end()));
 }
 
        std::copy(scores.begin(), scores.end(), std::inserter(seen_topscore, seen_topscore.end()));
 }
 

+int Top10ScoreScreen::get_priority()
+{
+       return 5;
+}