From 8cb615efe6633c0523ceb78d1cbcb1072976c37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= Date: Mon, 14 Sep 2020 16:40:26 +0200 Subject: [PATCH] Add small updates --- assets/level1.gif | Bin 4896 -> 4919 bytes assets/level3.gif | Bin 4856 -> 4873 bytes assets/level4.gif | Bin 4659 -> 4680 bytes assets/level_test.gif | Bin 2736 -> 2851 bytes constants.h | 4 +- game.h | 10 +- levels.h | 2325 +++++++++++++---------------------------- main_pokitto.cpp | 16 +- main_sdl.c | 8 +- 9 files changed, 759 insertions(+), 1604 deletions(-) diff --git a/assets/level1.gif b/assets/level1.gif index 3f6fa82abdebe838d4b6293cdc2cdc21674211ec..1293ccc9364656949ab8838ac9f682d2477e5073 100644 GIT binary patch delta 974 zcmV;<12O!dCbuTA4FeS+{t-iRWnpw>WFU8GbZ8()Nlj1yvke1r41bhap8P1Ew&tN9 z8Xh5PnI!t4-RV><3Z6)bqD(2HO^Kog$s5h`4?hZ|^huvVN~A(spGbYq$X zTRIx0>EK$0BB55=q(+LMPpYIJv!z$sp?vY8Qo5er`J`KVq)DozOPZ!@>ZM$2rphv& zlUbP#I-V-pA1qp<6@MY11xlydd7gUeq69go{$mQEWHO(D+8<(?4uo2$N8pq;6FG_c z86LW*4_c>odZ;Xcr9*n8OvgvbrJk+2osHU$v1+7hdZlj~s>+G0rGL7ssOqc1v8ux=pny85 zR#B<^Xrh(Lt(0k@nJPhP5~QFCpw+6M*Q%8@lNDj1TdQUS2R!K#H?te5GpstT-53ZeuVqf%2aa;;OHr!Js@k zkPhpv`Kq!0!GE0)+o~ZevVC!};Yy__yZ*5%Yn~F@vTE|O8yd4RdlfXhohN&wg7;(zrYk9u(oac zwsFg~bBnPotE`^7reXW3X3DpI3%G)NMQ%F|a0@MRE2HbV=cyx3cr96*r!%bu{CqOx1NjXSXV0>3UhtXB)J{us40 zTDsNCt{Ypx%*&7T`=HO84i~JH9s9NG`lbSVS$`6ozwEiW{Yb(xYQLj_zvIiVCEJhE z(7;qmy<#iF>^r=GYp(y$k4x(Z1nCR>SONoiul-uO-HWDL3a5E`!y@diEsVS|thlp! zw@|#eO1#4BX~OA%#RH1MVXDH50+1EVkFPqkT&%B8>$Ag{#%jFAY|O^^(Pk_$AvGb# wCM(g#b}SPWu@ZTFw0j)KK;d^6cO1wKfggpU$2VLOdJM>dyvU5~5CH)IJ5lKO!vFvP delta 945 zcmV;i15W(6CZHy;4Fj_x191$0+bN&6=Aj=N9wBO(B>JG;=~OEUo=91q>A;jQ+LShG zki5|>|KOuPN}u!zq(d5{^?9U68l*q!qyD+1w3VY!nhvg2C=yzwOj@J}>ZD2fFOscp|F}i7b6_erzwidA3NwrDKwOD$(oT{v- zJ1MJswdU%c{F)@Dd!~u&sb-oXse8MeOSoIxul5N!i?W@6t{aeU@Sw07tG(N#(@PVS z{)-93o3X|lpQ2l(Lh7|1>bgu(B6MQcS{G|Dbx&3IuFnYhEk-rlwup{e_((u5%d$?WetH3+H_|d}u(2q## z2L$O0{8$15X|L`IyC7`015BiN+P4)ftS?-!TuZ~GJG-Qdw>eCqCG3wV482ObC@hS{ z^c#?_db28wv7SrD!|rFK$8{{oioD1t5fA`7OKa^` diff --git a/assets/level3.gif b/assets/level3.gif index 2bd80b3b3f1aab6cafc71600e99b3976d52a1f72..70d8a392cb1a266a38897a3ee8aa4a8c464f6404 100644 GIT binary patch delta 866 zcmV-o1D*W%C5a}m4FeS+{t-iRWnpw>WFU8GbZ8()Nlj1yvke2T41a2*wV9g;+MgK7 zno#|N}-$CnV%V&qgk4#nVL*Go=+;E z5K5qEIT+Y9Aj8r2f>X(g>2S8lJGap*p%I z7THar8l|{;9kH6J#fgz4`m4?Os;8P8Mrx(hsjQdLq);KPREn%;*{Vq@a7tzt?Q)XJsai3Lz9uFDz~-T9!%=&sgUpr*R6+To19pnnM)sR`hajK}(&>PoLt z60g8IuK>%e-wCeh`L6{_o8O72uDP$t8mtQ&u%e2sMc|AOo1PLou{7bW0xPfD%CS)4 zvB@b7=>VX6y0IdA5zFZQtRL%)3OljgnXxacu>`xa6swH3TC+AAvK@sKEX%W{3Sobm zseUS?JvyTwV1H~MU{N2?2vGY0srCUu_W`DGwI9F+T8j}vJG8k1s6QIEM7pbX%Ct@k zwT&RP#znQqWVKkUwQRt(U5k+ts;Ii!p++mC7h$&I^t4eswN-nyrjWH;8?xqZ5( zkqZ){OS+apvd7r3znZxHsifV?jA)R#5&F27>Y+&sysi5IgHXJ%Td%wuv74KsKbp6m zORN=9yn}GO`9Yo7=z61kD!Hm;)4jQDz%4tuhrnytAao5BR0$*a6X z`@GPr9e>l51Jqlj?+dbIBD`SBrS*Hi2AjWW`M95Jw6XiY;;W4KTE6!AtH)})T#CEy zD~+e?j2HWzCUA@{i=WGDw?*s09NMHGfLj1e6=X`P@%q4(`nd(Xo@6T*B%HtkJir~i zy&){W27D1QT&&j0z!-_G5FEP_oS-vI!#<0%3_n}M9K483+{8}rz7Nx~9DVG~un sq)?p2I8hNR!Nncx#Z(LwMWMxHoDxY8X^r1)7K2nr!jij1r&rN5b<2U?|8>tE4kc`Uuo$P9_QZlc@x~l@~uIMSQ=ozpFOPk-x zr>@zr%xbU=JFum?twrFB5}TeBTd_28s{{+19qX~Ax~$TW4gmV6^-8i(5&oUg8nVvF zuoc^#8w;}>yRs~6vC5dMHhZ((+EGYx5j}gBlQF2h%ArI0p~Lxq0mk+L7WDy*5VaqW zY9A1EA7Bbt`vGjQwHPt9sG2K;`lDh?q&ixmOlw|FD^5@=wNz`hSZfMe%e6x5wHPU( zj=G^^i?p>$p=T=%X{!lq+Xz!@TvdBaSDUq4%LZLbx7RtcR(ce3%ec{4v_o2W(DiMQuk5t>T~oQtl$IZawhxqG{#YbvAH`T?h#x|RX5{z|Yi z%biLJuAUpSfEuVC`liEcxfd}A$ZNaz`nwa0sclNSLRzEH3lhjX2+Hi6AJn<6H(Iop zySI9~qq2Lv$@{C+sjp`Vu_$Y*+?p%0DNNAGyv++?Y`Ug@#+x70lmpjWr0`3x@{75? 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 + #define SFG_LOG(str) printf("game: %s\n",str); // for debug only + + #define SFG_START_LEVEL 8 + +#define SFG_FPS 25 +#define SFG_TEXTURE_DISTANCE 6000 #define SFG_SCREEN_RESOLUTION_X 110 #define SFG_SCREEN_RESOLUTION_Y 88 #define SFG_RESOLUTION_SCALEDOWN 1 #define SFG_DITHERED_SHADOW 0 #define SFG_FOG_DIMINISH_STEP 2048 #define SFG_RAYCASTING_MAX_STEPS 20 -#define SFG_RAYCASTING_MAX_HITS 6 +#define SFG_RAYCASTING_MAX_HITS 5 #define SFG_RAYCASTING_SUBSAMPLE 2 #include "game.h" @@ -160,6 +164,10 @@ int main() { if (pokitto.update()) { + +if (SFG_game.frame % 32 == 0) +printf("%d\n",Pokitto::Core::fps_counter); + SFG_mainLoopBody(); } } diff --git a/main_sdl.c b/main_sdl.c index cd5334d..24606f2 100644 --- a/main_sdl.c +++ b/main_sdl.c @@ -23,9 +23,11 @@ #define SFG_BACKGROUND_BLUR 1 +#define SFG_FPS 60 + #define SFG_LOG(str) puts(str); - #define SFG_START_LEVEL 6 + #define SFG_START_LEVEL 8 #define SFG_IMMORTAL 1 // #define SFG_UNLOCK_DOOR 1 #define SFG_REVEAL_MAP 1 @@ -108,7 +110,7 @@ int8_t SFG_keyPressed(uint8_t key) break; case SFG_KEY_A: - return sdlKeyboardState[SDL_SCANCODE_G]; + return sdlKeyboardState[SDL_SCANCODE_G] || sdlKeyboardState[SDL_SCANCODE_RETURN]; break; case SFG_KEY_B: @@ -328,7 +330,7 @@ int main(int argc, char *argv[]) for (int i = 0; i < SFG_SFX_SAMPLE_COUNT; ++i) audioBuff[i] = 127; - SDL_PauseAudio(0); +// SDL_PauseAudio(0); running = 1;