From d3c6e319d9bacad9c345e40dbaf5985703eb01d3 Mon Sep 17 00:00:00 2001 From: SlyVTT Date: Fri, 14 Jul 2023 15:28:00 +0200 Subject: [PATCH] correction of a minor position issue in Dialogs on CG + better definition and use of GRAYMODEOK --- src/config.h | 2 +- src/dialogs.c | 6 +++--- src/main.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config.h b/src/config.h index 54bb80c..6afe302 100644 --- a/src/config.h +++ b/src/config.h @@ -3,7 +3,7 @@ #if !defined(FXCG50) && defined(COLOR2BIT) - #define GRAYMODEOK + #define GRAYMODEOK 1 #endif #define USB_FEATURE 1 diff --git a/src/dialogs.c b/src/dialogs.c index bb2a3e1..a6d2d44 100644 --- a/src/dialogs.c +++ b/src/dialogs.c @@ -13,7 +13,7 @@ extern font_t fontRPG; #define FONT_USED fontRPG -#ifdef GRAYMODEOK +#if GRAYMODEOK==1 #include uint32_t *lightVRAMnext, *darkVRAMnext; uint32_t *lightVRAMcurrent, *darkVRAMcurrent; @@ -24,7 +24,7 @@ void blit() { dupdate(); - #ifdef GRAYMODEOK + #if GRAYMODEOK==1 dgray_getvram( &lightVRAMnext, &darkVRAMnext ); dgray_getscreen( &lightVRAMcurrent, &darkVRAMcurrent ); @@ -114,7 +114,7 @@ int showtext_opt(Game *game, bopti_image_t *face, char *text, while(game->frame_duration < 1000) sleep(); game->frame_duration = 0; /* Ask the user to press EXE to continue. */ - dtext(1, y, C_BLACK, "[EXE] To continue ..."); + dtext(BOX_HEIGHT*PXSIZE, y, C_BLACK, "[EXE] to continue ..."); blit(); while(getkey().key != KEY_EXE) sleep(); } diff --git a/src/main.c b/src/main.c index bfb9a74..121a2ee 100644 --- a/src/main.c +++ b/src/main.c @@ -12,7 +12,7 @@ #endif //USB_FEATURE -#ifdef GRAYMODEOK +#if GRAYMODEOK==1 #include #endif //GRAYMODEOK @@ -41,7 +41,7 @@ Game game = { { if (game.screenshot && usb_is_open()) { - #ifdef GRAYMODEOK // This is a trick, if GRAYMODEOK is defined then + #if GRAYMODEOK==1 // This is a trick, if GRAYMODEOK is defined then // we make the code accessible if (dgray_enabled()) @@ -58,7 +58,7 @@ Game game = { if (game.record && usb_is_open()) { - #ifdef GRAYMODEOK + #if GRAYMODEOK==1 if (dgray_enabled()) usb_fxlink_videocapture_gray(false); @@ -95,7 +95,7 @@ int main(void) { /* start grayscale engine */ - #ifdef GRAYMODEOK + #if GRAYMODEOK==1 dgray(DGRAY_ON); #endif @@ -129,7 +129,7 @@ int main(void) { /* shutdown grayengine*/ - #ifdef GRAYMODEOK + #if GRAYMODEOK==1 dgray(DGRAY_OFF); #endif