aboutsummaryrefslogtreecommitdiffstats
path: root/demos/games/justget10
diff options
context:
space:
mode:
Diffstat (limited to 'demos/games/justget10')
-rw-r--r--demos/games/justget10/demo.mk2
-rw-r--r--demos/games/justget10/gfxconf.h82
-rw-r--r--demos/games/justget10/jg10.c12
-rw-r--r--demos/games/justget10/jg10.h2
-rw-r--r--demos/games/justget10/main.c4
5 files changed, 51 insertions, 51 deletions
diff --git a/demos/games/justget10/demo.mk b/demos/games/justget10/demo.mk
index 1487808b..9e58121c 100644
--- a/demos/games/justget10/demo.mk
+++ b/demos/games/justget10/demo.mk
@@ -6,4 +6,4 @@ GFXINC += $(DEMODIR) \
GFXSRC += $(DEMODIR)/main.c \
$(DEMODIR)/jg10.c
-DEFS += -DJG10_SHOW_SPLASH=TRUE
+DEFS += -DJG10_SHOW_SPLASH=GFXON
diff --git a/demos/games/justget10/gfxconf.h b/demos/games/justget10/gfxconf.h
index 9cfb3859..834b4a9d 100644
--- a/demos/games/justget10/gfxconf.h
+++ b/demos/games/justget10/gfxconf.h
@@ -31,65 +31,65 @@
#define _GFXCONF_H
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
-#define GFX_USE_GFILE TRUE
-#define GFILE_NEED_ROMFS TRUE
+#define GFX_USE_GFILE GFXON
+#define GFILE_NEED_ROMFS GFXON
#define GFILE_MAX_GFILES 24
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
-#define GDISP_NEED_IMAGE TRUE
-#define GDISP_NEED_IMAGE_BMP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE TRUE
-#define GDISP_NEED_ARC TRUE
-#define GDISP_NEED_STARTUP_LOGO FALSE
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
+#define GDISP_NEED_IMAGE GFXON
+#define GDISP_NEED_IMAGE_BMP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXON
+#define GDISP_NEED_ARC GFXON
+#define GDISP_NEED_STARTUP_LOGO GFXOFF
//////////////////
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GWIN GFXON
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GQUEUE_NEED_ASYNC TRUE
-#define GFX_USE_GQUEUE TRUE
-#define GWIN_REDRAW_IMMEDIATE TRUE
-#define GWIN_REDRAW_SINGLEOP TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GQUEUE_NEED_ASYNC GFXON
+#define GFX_USE_GQUEUE GFXON
+#define GWIN_REDRAW_IMMEDIATE GFXON
+#define GWIN_REDRAW_SINGLEOP GFXON
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_BUTTON TRUE
-#define GWIN_BUTTON_LAZY_RELEASE FALSE
-#define GWIN_NEED_SLIDER TRUE
-#define GWIN_FLAT_STYLING FALSE
+#define GWIN_NEED_WIDGET GFXON
+#define GWIN_NEED_BUTTON GFXON
+#define GWIN_BUTTON_LAZY_RELEASE GFXOFF
+#define GWIN_NEED_SLIDER GFXON
+#define GWIN_FLAT_STYLING GFXOFF
-#define GWIN_NEED_CONTAINERS TRUE
-#define GWIN_NEED_CONTAINER TRUE
-#define GWIN_NEED_FRAME FALSE
-#define GWIN_NEED_TABSET FALSE
+#define GWIN_NEED_CONTAINERS GFXON
+#define GWIN_NEED_CONTAINER GFXON
+#define GWIN_NEED_FRAME GFXOFF
+#define GWIN_NEED_TABSET GFXOFF
-#define GWIN_NEED_CONSOLE TRUE
- #define GWIN_CONSOLE_USE_HISTORY TRUE
- #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE
- #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE
- #define GWIN_CONSOLE_ESCSEQ TRUE
- #define GWIN_CONSOLE_USE_BASESTREAM TRUE
-#define GWIN_NEED_GRAPH TRUE
+#define GWIN_NEED_CONSOLE GFXON
+ #define GWIN_CONSOLE_USE_HISTORY GFXON
+ #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON
+ #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON
+ #define GWIN_CONSOLE_ESCSEQ GFXON
+ #define GWIN_CONSOLE_USE_BASESTREAM GFXON
+#define GWIN_NEED_GRAPH GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-11 02:50:49 +0000