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 2db7bfd4ecc3c167e309d9c42a20c82db235446a..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"
 


@@ -36,7 +37,7 @@ bool Top10ScoreScreen::check_invalidated()
 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;


@@ -44,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


@@ -87,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;
+}