diff options
Diffstat (limited to 'demos/games/justget10')
-rw-r--r-- | demos/games/justget10/jg10.c | 12 | ||||
-rw-r--r-- | demos/games/justget10/jg10.h | 2 | ||||
-rw-r--r-- | demos/games/justget10/main.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/demos/games/justget10/jg10.c b/demos/games/justget10/jg10.c index 6ea4e951..f9974fe1 100644 --- a/demos/games/justget10/jg10.c +++ b/demos/games/justget10/jg10.c @@ -209,18 +209,18 @@ static bool_t checkForPossibleMove(void) { } static void printGameOver(void) { - gdispFillArea(JG10_TOTAL_FIELD_WIDTH, (gdispGetHeight()/2)-10, gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH, 80, Black); + gdispFillArea(JG10_TOTAL_FIELD_WIDTH, (gdispGetHeight()/2)-10, gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH, 80, GFX_BLACK); if (jg10GameOver) { - gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth("Game Over", font)/2), gdispGetHeight()/2, "Game Over", font, White); + gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth("Game Over", font)/2), gdispGetHeight()/2, "Game Over", font, GFX_WHITE); } } static void printCongrats(void) { char pps_str[3]; - gdispFillArea(JG10_TOTAL_FIELD_WIDTH, (gdispGetHeight()/2)-10, gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH, 80, Black); - gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth("Congrats, now try to get", font)/2), gdispGetHeight()/2, "Congrats, now try to get", font, White); + gdispFillArea(JG10_TOTAL_FIELD_WIDTH, (gdispGetHeight()/2)-10, gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH, 80, GFX_BLACK); + gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth("Congrats, now try to get", font)/2), gdispGetHeight()/2, "Congrats, now try to get", font, GFX_WHITE); uitoa(jg10MaxVal+1, pps_str, sizeof(pps_str)); - gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth(pps_str, font)/2), (gdispGetHeight()/2)+20, pps_str, font, Red); + gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth(pps_str, font)/2), (gdispGetHeight()/2)+20, pps_str, font, GFX_RED); } static DECLARE_THREAD_FUNCTION(thdJg10, msg) { @@ -456,7 +456,7 @@ void guiCreate(void) { void jg10Start(void) { #if JG10_SHOW_SPLASH gtimerStop(&jg10SplashBlink); - gdispClear(Black); + gdispClear(GFX_BLACK); #endif initField(); guiCreate(); diff --git a/demos/games/justget10/jg10.h b/demos/games/justget10/jg10.h index 58e76570..7ee5ea37 100644 --- a/demos/games/justget10/jg10.h +++ b/demos/games/justget10/jg10.h @@ -7,7 +7,7 @@ #define JG10_FIELD_HEIGHT 5 #define JG10_TOTAL_FIELD_WIDTH (JG10_FIELD_WIDTH*JG10_CELL_WIDTH) #define JG10_TOTAL_FIELD_HEIGHT (JG10_FIELD_HEIGHT*JG10_CELL_HEIGHT) -#define JG10_SEL_COLOR Yellow +#define JG10_SEL_COLOR GFX_YELLOW #define JG10_MAX_COUNT 21 // Max number you can get +1, so if max number would be 20, then this number should be 21 (+ background) void jg10Init(void); diff --git a/demos/games/justget10/main.c b/demos/games/justget10/main.c index 11ee13c7..29749686 100644 --- a/demos/games/justget10/main.c +++ b/demos/games/justget10/main.c @@ -17,7 +17,7 @@ int main(void) jg10ShowSplash(); #else font = gdispOpenFont("DejaVuSans16_aa"); - gdispDrawString((gdispGetWidth()/2)-(gdispGetStringWidth("Touch to start!", font)/2), gdispGetHeight()/2, "Touch to start!", font, White); + gdispDrawString((gdispGetWidth()/2)-(gdispGetStringWidth("Touch to start!", font)/2), gdispGetHeight()/2, "Touch to start!", font, GFX_WHITE); gdispCloseFont(font); #endif @@ -30,7 +30,7 @@ int main(void) #if !JG10_SHOW_SPLASH font = gdispOpenFont("DejaVuSans16"); - gdispFillArea((gdispGetWidth()/2)-(gdispGetStringWidth("Touch to start!", font)/2), gdispGetHeight()/2, gdispGetWidth()/2, 17, Black); + gdispFillArea((gdispGetWidth()/2)-(gdispGetStringWidth("Touch to start!", font)/2), gdispGetHeight()/2, gdispGetWidth()/2, 17, GFX_BLACK); gdispCloseFont(font); #endif |