mirror of
https://git.planet-casio.com/Slyvtt/Collab_RPG.git
synced 2024-12-28 20:43:42 +01:00
Merge branch 'master' of gitea.planet-casio.com:Slyvtt/Collab_RPG
This commit is contained in:
commit
e53c3d612d
3 changed files with 9 additions and 9 deletions
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
|
|
||||||
#if !defined(FXCG50) && defined(COLOR2BIT)
|
#if !defined(FXCG50) && defined(COLOR2BIT)
|
||||||
#define GRAYMODEOK
|
#define GRAYMODEOK 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define USB_FEATURE 1
|
#define USB_FEATURE 1
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
extern font_t fontRPG;
|
extern font_t fontRPG;
|
||||||
#define FONT_USED fontRPG
|
#define FONT_USED fontRPG
|
||||||
|
|
||||||
#ifdef GRAYMODEOK
|
#if GRAYMODEOK==1
|
||||||
#include <gint/gray.h>
|
#include <gint/gray.h>
|
||||||
uint32_t *lightVRAMnext, *darkVRAMnext;
|
uint32_t *lightVRAMnext, *darkVRAMnext;
|
||||||
uint32_t *lightVRAMcurrent, *darkVRAMcurrent;
|
uint32_t *lightVRAMcurrent, *darkVRAMcurrent;
|
||||||
|
@ -24,7 +24,7 @@ void blit()
|
||||||
{
|
{
|
||||||
dupdate();
|
dupdate();
|
||||||
|
|
||||||
#ifdef GRAYMODEOK
|
#if GRAYMODEOK==1
|
||||||
dgray_getvram( &lightVRAMnext, &darkVRAMnext );
|
dgray_getvram( &lightVRAMnext, &darkVRAMnext );
|
||||||
dgray_getscreen( &lightVRAMcurrent, &darkVRAMcurrent );
|
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();
|
while(game->frame_duration < 1000) sleep();
|
||||||
game->frame_duration = 0;
|
game->frame_duration = 0;
|
||||||
/* Ask the user to press EXE to continue. */
|
/* 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();
|
blit();
|
||||||
while(getkey().key != KEY_EXE) sleep();
|
while(getkey().key != KEY_EXE) sleep();
|
||||||
}
|
}
|
||||||
|
|
10
src/main.c
10
src/main.c
|
@ -12,7 +12,7 @@
|
||||||
#endif //USB_FEATURE
|
#endif //USB_FEATURE
|
||||||
|
|
||||||
|
|
||||||
#ifdef GRAYMODEOK
|
#if GRAYMODEOK==1
|
||||||
#include <gint/gray.h>
|
#include <gint/gray.h>
|
||||||
#endif //GRAYMODEOK
|
#endif //GRAYMODEOK
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ Game game = {
|
||||||
{
|
{
|
||||||
if (game.screenshot && usb_is_open()) {
|
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
|
// we make the code accessible
|
||||||
|
|
||||||
if (dgray_enabled())
|
if (dgray_enabled())
|
||||||
|
@ -58,7 +58,7 @@ Game game = {
|
||||||
|
|
||||||
if (game.record && usb_is_open()) {
|
if (game.record && usb_is_open()) {
|
||||||
|
|
||||||
#ifdef GRAYMODEOK
|
#if GRAYMODEOK==1
|
||||||
|
|
||||||
if (dgray_enabled())
|
if (dgray_enabled())
|
||||||
usb_fxlink_videocapture_gray(false);
|
usb_fxlink_videocapture_gray(false);
|
||||||
|
@ -95,7 +95,7 @@ int main(void) {
|
||||||
|
|
||||||
/* start grayscale engine */
|
/* start grayscale engine */
|
||||||
|
|
||||||
#ifdef GRAYMODEOK
|
#if GRAYMODEOK==1
|
||||||
dgray(DGRAY_ON);
|
dgray(DGRAY_ON);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ int main(void) {
|
||||||
|
|
||||||
|
|
||||||
/* shutdown grayengine*/
|
/* shutdown grayengine*/
|
||||||
#ifdef GRAYMODEOK
|
#if GRAYMODEOK==1
|
||||||
dgray(DGRAY_OFF);
|
dgray(DGRAY_OFF);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue