Parametrize color scheme into a separate header file.

[ccbs] / bigscreen / top10scorescreen.cpp

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index 275a4f5dc998531f1d97dcb8186264cf0b3f841f..5ff01a88f54db6f9689c52d928aa690d483b0dfb 100644 (file)
--- a/bigscreen/top10scorescreen.cpp
+++ b/bigscreen/top10scorescreen.cpp
@@ -45,7 +45,13 @@ bool Top10ScoreScreen::check_invalidated()
 void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
        scores_changed.reset_flag();
-       memset(buf, 0, width * height * 4);
+       unsigned char *ptr = buf;
+       for (unsigned i = 0; i < width * height; ++i) {
+               *ptr++ = BACKGROUND_BLUE;
+               *ptr++ = BACKGROUND_GREEN;
+               *ptr++ = BACKGROUND_RED;
+               *ptr++ = 0;
+       }
        set_screen_size(width, height);
 
        // fetch the top 10 scores
@@ -54,28 +60,30 @@ void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 
        {
                unsigned width = my_draw_text("Today's top 10 scores", NULL, 40.0);
-               my_draw_text("Today's top 10 scores", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
+               my_draw_text("Today's top 10 scores", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60, MAIN_HEADING_RED, MAIN_HEADING_GREEN, MAIN_HEADING_BLUE);
        }
 
        // simple headings
-       my_draw_text("Player", buf, 12.0, PLAYER_X, 100);
-       my_draw_text("Song", buf, 12.0, SONG_X, 100);
+       my_draw_text("Player", buf, 12.0, PLAYER_X, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE);
+       my_draw_text("Song", buf, 12.0, SONG_X, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE);
        width = my_draw_text("Score", NULL, 12.0);
-       my_draw_text("Score", buf, 12.0, SCORE_X - width/2, 100);
+       my_draw_text("Score", buf, 12.0, SCORE_X - width/2, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE);
        
        unsigned row = 1, y = 140;
        for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
                char str[16];
-               unsigned r = 255, g = 255, b = 255;
+               unsigned r = DATA_RED, g = DATA_GREEN, b = DATA_BLUE, rh = ROW_HEADING_RED, gh = ROW_HEADING_GREEN, bh = ROW_HEADING_BLUE;
 
                // print new entries in red
                if (seen_topscore.count(*i) == 0 && seen_topscore.size() > 0) {
-                       g = b = 0;
+                       r = rh = FRESH_DATA_RED;
+                       g = gh = FRESH_DATA_GREEN;
+                       b = bh = FRESH_DATA_BLUE;
                }
 
                std::sprintf(str, "%u", row++);
                unsigned width = my_draw_text(str, NULL, 24.0);
-               my_draw_text(str, buf, 24.0, RANK_X - width/2, y);
+               my_draw_text(str, buf, 24.0, RANK_X - width/2, y, rh, gh, bh);
 
                my_draw_text(i->nick, buf, 24.0, PLAYER_X, y, r, g, b);