From 2f6c647f12e7d1be4e4aac3809a152ed0b782cef Mon Sep 17 00:00:00 2001 From: KikooDX Date: Thu, 27 May 2021 12:24:17 +0200 Subject: [PATCH] many changes boring to add separatly --- 0broken.kble | Bin 0 -> 356 bytes CMakeLists.txt | 5 +++-- assets/graphics/tileset.png | Bin 1279 -> 1414 bytes assets/levels/02/0martha.kble | Bin 356 -> 356 bytes assets/levels/02/1eden.kble | Bin 0 -> 356 bytes assets/levels/02/1roots.kble | Bin 356 -> 0 bytes assets/levels/02/3midnight.kble | Bin 0 -> 356 bytes include/conf.h | 1 + src/main.c | 32 ++++++++++++++++++++++++++++++-- 9 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 0broken.kble create mode 100644 assets/levels/02/1eden.kble delete mode 100644 assets/levels/02/1roots.kble create mode 100644 assets/levels/02/3midnight.kble diff --git a/0broken.kble b/0broken.kble new file mode 100644 index 0000000000000000000000000000000000000000..2dfc95047506618b910ac902c6f677f170f513a8 GIT binary patch literal 356 zcmbV_!4AM62t&&@@wU7F|D$W=qN0~IAtaBsz|ip8Z@~+*j%R6rJ3t=y;V3R~543mC l3l!xhUGi4t?uqlQ`ZWtTi=NDx;g22fnbZ?t??0F`{s5DJ0ulfK literal 0 HcmV?d00001 diff --git a/CMakeLists.txt b/CMakeLists.txt index e4c2d25..c345618 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/assets/graphics/tileset.png b/assets/graphics/tileset.png index 61d990aa539a24c609ecb49cecdf0f7969284276..8b645253e51e0c460fda9d09a2e3cce8c3463072 100644 GIT binary patch literal 1414 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K56gb#`oxM2e69M^ySaPSsUC6F8ShT! zKRk18o%qLHm-JJ9u9{M$A#bnybguf->-+6=`0rP*-lK7Us=Iv5^wsO-r+s>IH)vkH z_1f!CpQq2CcHIA-zP;`LWij#o_x-21>+=Wm&KKu@l4v0DhyTgp?cW(HetutQQ}H;f zRQAtyo4*gg)b0P1bmt)J#QkS%*%=h`*V_L1cys0Y?e#A&^ZGg4^Y7U=dp_^EX@6Yb znKE#czu$Gt=11|n>k1EIzx+*Wt?sOR@b%80oPudj^b7kL9ab!UEpuqU*r#jXAN}^v zn-}?b_5EvG%e#NRzwym?MP%zY)327l4@OSjf5eupLE*~Y*Fs!B!gjd6mgH^NIw8L{ zyzs~8&qvFPzCP>s)s>N}F9~}5>gM~qw>lSpE3nY}b^g}N^UB+23yZwa6)BsSxW2UD z8_d@1-X`5`hjgRP3l^<4os*dxz|Y{c-uRm?hyB9&^?3y~(>@%2CJ?Z|@!&dp{e|gl z;*S56zDqDP1$sd)@~81% z_!t~tC`!~BKK;M!$ZAG~Jo9diD^3U3eNTF6{QKa|N&64LLwkD!cg5@Kg%k2G8Zx}& z$ljlPcfS*F>5k{mf31Op=6Xg2j`HlgO%v8{6#aKP>8)+f|GL&{PS$zvx5&q^{OrC{ z%)sHaZ`(H`d6w_$KeAuce%ae>_2P|VdULm8{mg3qhJ$yVofBC8E1isgCBe{q@Me*) zo%s>2^{YiMb^G-0J>ach(f5kMc1P*Agm+8DE6cVzRZU#EQM}?M>-j+01?=1XCf#9; z6S~O#V6SUwgWMgf$Y*x%v@d=?U)>GXHE9lCL!5BmvSrt!bt&7Kb71Qjuh4z~V53T`I{86b8Z`Ifg~o zTNbZe`PI~Ktw&fzE6J<@9^)Q3wm(gF_}C2rR%cTwG-k}vQj3p sZ?AXLULrnIs=9G{+y@!7c=G(juUpa45^s&_J(&~jH^KF zL!B1KJz)&WDs0mxO6-`;`8t`s=LXYj2ag8b$^?I#uWCB>r_5LV*}nPm_pr1%9$W9O z`@wdutaNV2ich^FN#R~Mr_2A>e7d^()03;;pT0AXpK|=^`l9!{PjCADH&0VMe)^{m z=b!G;`EUPY=bimOw*C43p}(kd=byU3cYAN>o0jyyzrmxqlwV<-)en#!}~{b?23yz z>?Mr#7^dB--WKt1t?K)~_x}97{LwbLu6ozpzdN?ff4uF?+`NE43uhEEN=&Qz5|hkb zm$lRPy=@s|j_%Ku_d~zw*T??#E1UoS_SvNR|LxhPW&HDa)5Y80)YV(OslTRIFBkK7 z!lX`n0f;5nayFh_`P6Lh_l-}=u2q~p*Y}Gl;pJP?x_5~`BY%B+FWdfo)1MRG3Tr#< zd4L)Y2ldZedoOA6ce`nK&PlDmc{B0!J{fkMy?c+Hx83&P?WXm6w>`SBJ+|(N>V&9| z?1{%%4+K@8kILV8v0C0cFTMBrn>P{B-?m=gwnq2&t!&xTwgrDU^2PsuaQE8!!`bjL zlY!3H7dKz&npM3|KKXXd$60e_vrq5)c1tY!+tVGt{QrG>-#qQF{gF>h9ok9hQ!HDO(y$H^n|9g^Y= zi7VaDn{K<4mVK~#zxlQ&%XwlL@)H;u$w*Ggq!CP0L7^Of_B|nOrHn(vW*|Pf}Vw-;;&cIJ^Eb*Lm&v z&rp+pPv(U4TH&kb3fJwqZ-0NbIs2!8*DSI78Qj_fjJ8_E2WPn&c5mN43uM@$SC($+ z7@|%0Vj1o+UI80(ROa5lERY4ANqqVBrXaIi4BNNw2WxNo#FT(3x@gAX+wo@`ZLU~3 zRx%pE)FMO!&pdp){+WYZ*4zbq7~pCVq8iUWd literal 356 zcmbV^F%G~W3(}5tTQCo8=)SyU(aGG{DZmJKIJ9jaTjT5#}7p(QzIEn?Y_TOWSJE1hGS4Gx>V| JS|u*}ix;)g0*L?s literal 0 HcmV?d00001 diff --git a/assets/levels/02/1roots.kble b/assets/levels/02/1roots.kble deleted file mode 100644 index 129bfcd9b9a175605d1688dc8dd923db28255117..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 356 zcmZ`#K@Pwm2y3^Ax83*ukFJ2C7fDQ73$zO2!^>k~uU3Ry5Tq4dLZadYnt7o{N&r)^ zVY3NRAe-Ttpm$Ms4w`IsNNId3;u`g<+7sAtUw|i?LZr}}%#VU5aN>QMj)vS6ExMO- G{6hXFivi~V diff --git a/assets/levels/02/3midnight.kble b/assets/levels/02/3midnight.kble new file mode 100644 index 0000000000000000000000000000000000000000..2947345f70496bf9ac8b6b6311c1e661b64655a5 GIT binary patch literal 356 zcmZ{f!4AM62t#ojy3_9a{~ujjLCq3-5W_1)t=MZ%*~=hO){xA+pK3d_keYrqgG7RI z(u|oSqgSAK9nC7i97x1<*fRlrRJ>yp*8+eWt!c;A #include #include +#include + +#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; }