aboutsummaryrefslogtreecommitdiffstats
path: root/demos/games/minesweeper
diff options
context:
space:
mode:
Diffstat (limited to 'demos/games/minesweeper')
-rw-r--r--demos/games/minesweeper/demo.mk2
-rw-r--r--demos/games/minesweeper/gfxconf.h45
-rw-r--r--demos/games/minesweeper/main.c2
-rw-r--r--demos/games/minesweeper/mines.c26
-rw-r--r--demos/games/minesweeper/readme.txt2
5 files changed, 38 insertions, 39 deletions
diff --git a/demos/games/minesweeper/demo.mk b/demos/games/minesweeper/demo.mk
index 43869d7e..41b18106 100644
--- a/demos/games/minesweeper/demo.mk
+++ b/demos/games/minesweeper/demo.mk
@@ -6,4 +6,4 @@ GFXINC += $(DEMODIR) \
GFXSRC += $(DEMODIR)/main.c \
$(DEMODIR)/mines.c
-DEFS += -DMINES_SHOW_SPLASH=TRUE
+DEFS += -DMINES_SHOW_SPLASH=GFXON
diff --git a/demos/games/minesweeper/gfxconf.h b/demos/games/minesweeper/gfxconf.h
index 468b32e2..c0961839 100644
--- a/demos/games/minesweeper/gfxconf.h
+++ b/demos/games/minesweeper/gfxconf.h
@@ -31,35 +31,34 @@
#define _GFXCONF_H
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN 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
/* 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
/* Builtin Fonts */
-#define GDISP_INCLUDE_USER_FONTS TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE
-#define GDISP_INCLUDE_FONT_FIXED_10X20 TRUE
-#define GDISP_INCLUDE_FONT_FIXED_5X8 TRUE
+#define GDISP_INCLUDE_USER_FONTS GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON
+#define GDISP_INCLUDE_FONT_FIXED_10X20 GFXON
+#define GDISP_INCLUDE_FONT_FIXED_5X8 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/minesweeper/main.c b/demos/games/minesweeper/main.c
index 84943922..e7a105bf 100644
--- a/demos/games/minesweeper/main.c
+++ b/demos/games/minesweeper/main.c
@@ -51,7 +51,7 @@ int main(void)
minesShowSplash();
#else
font = gdispOpenFont("DejaVuSans16");
- gdispDrawString((gdispGetWidth()-gdispGetStringWidth("Touch to start!", font))/2, gdispGetHeight()-25, "Touch to start!", font, White);
+ gdispDrawString((gdispGetWidth()-gdispGetStringWidth("Touch to start!", font))/2, gdispGetHeight()-25, "Touch to start!", font, GFX_WHITE);
gdispCloseFont(font);
#endif
diff --git a/demos/games/minesweeper/mines.c b/demos/games/minesweeper/mines.c
index 55d70984..8b0cd292 100644
--- a/demos/games/minesweeper/mines.c
+++ b/demos/games/minesweeper/mines.c
@@ -95,11 +95,11 @@ static void printStats(void)
font_t font = gdispOpenFont("fixed_5x8");
uitoa(MINES_MINE_COUNT, pps_str, sizeof(pps_str));
- gdispFillString(minesStatusIconWidth+8, gdispGetHeight()-11, " ", font, Black, Black);
- gdispDrawString(minesStatusIconWidth+8, gdispGetHeight()-11, pps_str, font, White);
+ gdispFillString(minesStatusIconWidth+8, gdispGetHeight()-11, " ", font, GFX_BLACK, GFX_BLACK);
+ gdispDrawString(minesStatusIconWidth+8, gdispGetHeight()-11, pps_str, font, GFX_WHITE);
uitoa(minesFlags, pps_str, sizeof(pps_str));
- gdispFillString(8+(minesStatusIconWidth*2)+gdispGetStringWidth("99999", font), gdispGetHeight()-11, " ", font, Black, Black);
- gdispDrawString(8+(minesStatusIconWidth*2)+gdispGetStringWidth("99999", font), gdispGetHeight()-11, pps_str, font, White);
+ gdispFillString(8+(minesStatusIconWidth*2)+gdispGetStringWidth("99999", font), gdispGetHeight()-11, " ", font, GFX_BLACK, GFX_BLACK);
+ gdispDrawString(8+(minesStatusIconWidth*2)+gdispGetStringWidth("99999", font), gdispGetHeight()-11, pps_str, font, GFX_WHITE);
gdispCloseFont(font);
}
@@ -112,8 +112,8 @@ static void minesUpdateTime(void)
font_t font = gdispOpenFont("digital_7__mono_20");
uitoa(minesTime, pps_str, sizeof(pps_str));
- gdispFillArea((MINES_FIELD_WIDTH*MINES_CELL_WIDTH)-gdispGetStringWidth("9999", font), gdispGetHeight()-15, gdispGetWidth(), 15, Black);
- gdispDrawString((MINES_FIELD_WIDTH*MINES_CELL_WIDTH)-gdispGetStringWidth(pps_str, font), gdispGetHeight()-15, pps_str, font, Lime);
+ gdispFillArea((MINES_FIELD_WIDTH*MINES_CELL_WIDTH)-gdispGetStringWidth("9999", font), gdispGetHeight()-15, gdispGetWidth(), 15, GFX_BLACK);
+ gdispDrawString((MINES_FIELD_WIDTH*MINES_CELL_WIDTH)-gdispGetStringWidth(pps_str, font), gdispGetHeight()-15, pps_str, font, GFX_LIME);
gdispCloseFont(font);
}
@@ -141,7 +141,7 @@ static void showOne(int16_t x, int16_t y)
minesFlags--;
}
- gdispFillArea((x*MINES_CELL_WIDTH)+1, (y*MINES_CELL_HEIGHT)+1, MINES_CELL_WIDTH-1, MINES_CELL_HEIGHT-1, Black);
+ gdispFillArea((x*MINES_CELL_WIDTH)+1, (y*MINES_CELL_HEIGHT)+1, MINES_CELL_WIDTH-1, MINES_CELL_HEIGHT-1, GFX_BLACK);
if ((minesField[x][y].num > 0) && (minesField[x][y].num < 9)) {
gdispImageOpenFile(&minesImage, minesGraph[minesField[x][y].num-1]);
@@ -253,13 +253,13 @@ static void printGameOver(void)
if (minesGameOver) {
font_t font = gdispOpenFont("DejaVuSans16");
if (minesGameWinner) {
- gdispDrawString((gdispGetWidth()-gdispGetStringWidth("You LIVE!", font))/2, gdispGetHeight()-15, "You LIVE!", font, White);
+ gdispDrawString((gdispGetWidth()-gdispGetStringWidth("You LIVE!", font))/2, gdispGetHeight()-15, "You LIVE!", font, GFX_WHITE);
} else {
- gdispDrawString((gdispGetWidth()-gdispGetStringWidth("You DIED!", font))/2, gdispGetHeight()-15, "You DIED!", font, White);
+ gdispDrawString((gdispGetWidth()-gdispGetStringWidth("You DIED!", font))/2, gdispGetHeight()-15, "You DIED!", font, GFX_WHITE);
}
gdispCloseFont(font);
} else {
- gdispFillArea(0, gdispGetHeight()-25, gdispGetWidth(), 25, Black);
+ gdispFillArea(0, gdispGetHeight()-25, gdispGetWidth(), 25, GFX_BLACK);
}
}
@@ -317,7 +317,7 @@ static void initField(void)
for (y = 0; y < MINES_FIELD_HEIGHT; y++) {
i = minesField[x][y].fieldNum/MINES_FIELD_HEIGHT;
j = minesField[x][y].fieldNum-(i*MINES_FIELD_HEIGHT);
- gdispFillArea((i*MINES_CELL_WIDTH)+1, (j*MINES_CELL_HEIGHT)+1, MINES_CELL_WIDTH, MINES_CELL_HEIGHT, Black);
+ gdispFillArea((i*MINES_CELL_WIDTH)+1, (j*MINES_CELL_HEIGHT)+1, MINES_CELL_WIDTH, MINES_CELL_HEIGHT, GFX_BLACK);
gfxSleepMilliseconds(2);
}
}
@@ -378,7 +378,7 @@ void minesStart(void)
#if MINES_SHOW_SPLASH
gtimerStop(&minesSplashBlink);
- gdispClear(Black);
+ gdispClear(GFX_BLACK);
#endif
initField();
@@ -442,5 +442,5 @@ void minesInit(void)
{
initRng();
- gdispClear(Black);
+ gdispClear(GFX_BLACK);
}
diff --git a/demos/games/minesweeper/readme.txt b/demos/games/minesweeper/readme.txt
index e820fe63..f207da09 100644
--- a/demos/games/minesweeper/readme.txt
+++ b/demos/games/minesweeper/readme.txt
@@ -1,6 +1,6 @@
A demo Minesweeper game using. Various configuration options can be found in mines.h
-NOTE: You can save FLASH space by disabling the splash-screen, to do that set MINES_SHOW_SPLASH to FALSE.
+NOTE: You can save FLASH space by disabling the splash-screen, to do that set MINES_SHOW_SPLASH to GFXOFF.
Credits:
Code: Fleck
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 05:50:54 +0000