Added FXG3A build targets with dully corrected code [dev]

This commit is contained in:
Sylvain PILLOT 2024-03-27 10:44:15 +01:00
parent 66a24edb44
commit 6b333303ec
6 changed files with 27 additions and 38 deletions

View file

@ -2,27 +2,40 @@
#define CONFIG_H #define CONFIG_H
#if !defined(FXCG50) && defined(COLOR2BIT) #define USB_FEATURE 0
#define DEBUGMODE 0
/* Enable GrayMode on either FX and FX_G3A targets */
#if GINT_RENDER_MONO && defined(COLOR2BIT)
#define GRAYMODEOK 1 #define GRAYMODEOK 1
#endif #endif
#define USB_FEATURE 0
#define DEBUGMODE 0
#ifdef FXCG50 #if GINT_RENDER_RGB
#define T_HEIGHT 16 #define T_HEIGHT 16
#define T_WIDTH 16 #define T_WIDTH 16
#define PXSIZE 2
#define PATH_COLOR C_RED
#define P_WIDTH 16
#define P_HEIGHT 16
#else #else
#define T_HEIGHT 8 #define T_HEIGHT 8
#define T_WIDTH 8 #define T_WIDTH 8
#endif
#ifdef FXCG50
#define PXSIZE 2
#else
#define PXSIZE 1 #define PXSIZE 1
#define PATH_COLOR C_BLACK
#define P_WIDTH 8
#define P_HEIGHT 8
#endif #endif
/* SPEED should NOT be 8 or bigger: it may cause bugs when handling
* collisions! */
#define SPEED PXSIZE*2
#define F_WIDTH (32*PXSIZE)
#define F_HEIGHT (32*PXSIZE)
#endif #endif

View file

@ -27,7 +27,7 @@ extern font_t fontRPG;
/* the color of the text to go to the next dialog phase */ /* the color of the text to go to the next dialog phase */
/* it improves readability to have somathing lighter */ /* it improves readability to have somathing lighter */
#if GRAYMODEOK || (defined(FXCG50) && !defined(COLOR1BIT)) #if GRAYMODEOK || (defined(GINT_RENDER_RGB) && !defined(COLOR1BIT))
#define NEXT_COLOR C_DARK #define NEXT_COLOR C_DARK
#else #else
#define NEXT_COLOR C_BLACK #define NEXT_COLOR C_BLACK
@ -38,7 +38,7 @@ void blit()
{ {
dupdate(); dupdate();
#if GRAYMODEOK #if GRAYMODEOK && !defined(GINT_HW_CG)
dgray_getvram( &lightVRAMnext, &darkVRAMnext ); dgray_getvram( &lightVRAMnext, &darkVRAMnext );
dgray_getscreen( &lightVRAMcurrent, &darkVRAMcurrent ); dgray_getscreen( &lightVRAMcurrent, &darkVRAMcurrent );

View file

@ -5,9 +5,7 @@
#include <string.h> #include <string.h>
#include "game.h" #include "game.h"
#include "map.h" #include "map.h"
#include "config.h"
#define F_WIDTH (32*PXSIZE)
#define F_HEIGHT (32*PXSIZE)
/* showtext_opt() /* showtext_opt()
* *

View file

@ -130,7 +130,7 @@ int main(void) {
/* render the map */ /* render the map */
draw(&game); draw(&game);
#if DEBUGMODE && FXCG50 #if DEBUGMODE && GINT_RENDER_RGB
if (game.debug_map) if (game.debug_map)
{ {
dfont( NULL ); dfont( NULL );

View file

@ -14,15 +14,6 @@
extern bopti_image_t demo_PNJ_img; extern bopti_image_t demo_PNJ_img;
/* the color of the text to go to the next dialog phase */
/* it improves readability to have somathing lighter */
#if defined(FXCG50)
#define PATH_COLOR C_RED
#else
#define PATH_COLOR C_BLACK
#endif
NPC *npcRPG; NPC *npcRPG;
uint32_t nbNPC = 0; uint32_t nbNPC = 0;

View file

@ -1,21 +1,8 @@
#ifndef PLAYER_H #ifndef PLAYER_H
#define PLAYER_H #define PLAYER_H
/* The size of the player. */
#ifdef FXCG50
#define P_WIDTH 16
#define P_HEIGHT 16
#else
#define P_WIDTH 8
#define P_HEIGHT 8
#endif
/* SPEED should NOT be 8 or bigger: it may cause bugs when handling
* collisions! */
#define SPEED PXSIZE*2
#include <stdbool.h> #include <stdbool.h>
#include "config.h"
#include "game.h" #include "game.h"
#include "memory.h" #include "memory.h"