many changes boring to add separatly

This commit is contained in:
KikooDX 2021-05-27 12:24:17 +02:00
parent 38b52a1488
commit 2f6c647f12
9 changed files with 34 additions and 4 deletions

BIN
0broken.kble Normal file

Binary file not shown.

View File

@ -7,7 +7,7 @@ project(MTEM C)
include(GenerateG3A)
include(Fxconv)
find_package(Gint 2.4.0 REQUIRED)
find_package(Gint 2.5.0 REQUIRED)
find_package(LibImg 2.4.0 REQUIRED)
include_directories(include generated/include)
@ -60,8 +60,9 @@ set(LEVELS
assets/levels/01/2dos.kble
assets/levels/01/3secrets.kble
assets/levels/02/0martha.kble
assets/levels/02/1roots.kble
assets/levels/02/1eden.kble
assets/levels/02/2noon.kble
assets/levels/02/3midnight.kble
)
add_custom_target(filepaths

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

BIN
assets/levels/02/1eden.kble Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -25,3 +25,4 @@
#define BURST_BOOST 0.5
#define V_TRANS_SPD (1.0 / 20.0)
#define H_TRANS_SPD (1.0 / 20.0)
/* #define RECORDING */

View File

@ -20,13 +20,25 @@
#include <gint/gint.h>
#include <gint/keyboard.h>
#include <gint/timer.h>
#include <gint/usb-ff-bulk.h>
#ifdef RECORDING
#define DUPDATE() \
do { \
dupdate(); \
if (usb_is_open()) \
usb_fxlink_screenshot(1); \
} while (0);
#else
#define DUPDATE() dupdate();
#endif
#define PANIC(msg) \
do { \
dclear(ZX_BLACK); \
dprint_opt(DWIDTH / 2, DHEIGHT / 2, ZX_RED, C_NONE, \
DTEXT_CENTER, DTEXT_MIDDLE, "ERROR: %s", msg); \
dupdate(); \
DUPDATE(); \
getkey(); \
return 0; \
} while (0);
@ -71,6 +83,12 @@ main(void)
struct Transition transition;
particles_init();
#ifdef RECORDING
/* open usb for screenshots */
usb_interface_t const *interfaces[] = {&usb_ff_bulk, NULL};
usb_open(interfaces, GINT_CALL_NULL);
#endif
/* set font */
dfont(&font_main);
@ -96,9 +114,11 @@ main(void)
/* skip render frames */
i = 1 + frameskip;
while (i-- > 0) {
#ifndef RECORDING
/* frameskip adjustement */
if (has_ticked - 1 > frameskip)
frameskip = has_ticked - 1;
#endif
/* speed limiter */
while (!has_ticked)
@ -247,11 +267,15 @@ main(void)
PANIC("missing game_state case (draw)");
break;
}
dupdate();
DUPDATE();
/* return to main menu */
/* TODO don't hardcode this */
if (keydown(KEY_MENU)) {
#ifdef RECORDING
if (usb_is_open())
usb_close();
#endif
gint_osmenu();
if (game_state == Playing)
game_state = GamePause;
@ -259,6 +283,10 @@ main(void)
}
timer_stop(timer);
#ifdef RECORDING
if (usb_is_open())
usb_close();
#endif
return 1;
}