From ff4fb37e3a5ea2f9c40630eebd0d2588d974dce0 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Fri, 23 Aug 2024 15:42:21 +0200 Subject: [PATCH] some rebalancing --- bin/back | Bin 101528 -> 101528 bytes src/display.c | 2 +- src/main.c | 2 +- src/move.c | 2 +- templates.txt | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 3 deletions(-) diff --git a/bin/back b/bin/back index 75b70b73db53407f128f6a90f1e598ed8737591e..64b1b35c7d3fcfe122652c25f19f4034a6d87422 100755 GIT binary patch delta 6970 zcmai330M?Ywyx7q3Q=r8S;N)}XuE-;EGh^iOM^OYAmV5=8Wj{pj0?^faZfrGjCw{( zianVz31NlKj+lF z)qT6zx~<*TZSB5x0oRoooOG=;c|f+NbMV+1A;>+&g6VPP@AlJ-Uv9Jk#4(LW7k?n$0dwd3q(McZ`@NGvDPq}6gMp}d{cOm7_OoMh_rLlq7pJ1}S zClr_p^s_W@1RHyW!6E!lug~BSmi7*Ie$t-f@J#RC@CtwH{Sg%4iasT94LkK6uDv;p zN{=Cgc?y8aPx702}N0&n2V{$T+p9$2jc z|H)e%x7q?EyD&;fxm9AY(#@>GFKEItX+qBLCfq0)4K(2cw9tgX(ga_}2}~gk^-*E) zZyXhMyM6X#DsbRP96TVr^UXgcqa3JD$_C>KfQWeTonh?(KWkYW*O^y5c>nbx{j#j>l|h7{0l+cF(>dO{QtmQX8-}M(-Z-)4gLSuUE*4YO<+LB9Cw&@2iu@FGFmR z6BTk}ttxVcO#Yb!DPw!&VG=oHlb!rj%7J#en%siAByZ0@J8-YmvcMsFJNI*i%d5FX z64%3lTPSlYf^A8USGfOmQI)h-;{G?usdILbxVmgR*G1t*skvnr+1>IO>OlS!4<>ch zJq)tNJtk#uww$X`#f_J_4Wy?I94&Fz+PV1(_iZ(|zD8Q5xenaw8fldR?BpPY+*+*) zJVz!wJCNUz$tHHZkUqO>rP|GwkJV(2Ox{k}sIz`qEiF@qoxDmRhpWlkHYIy|_IIFe zlBq2LwzvZn>WK@gq$3%%ip11W^%7NAWT*ZjRc^Lqs;TA+(jrZDAXngq|YLizTYB z1GPw^ntg3idnnZ1XH_YCOVqDOO`WlpQFU+GsaK@sGFt|zsr%1Lw<^_vTXt5uRnL5E zaX(VXb!JuEWSRUU3919f%jA#j-dBce@OH9K?KF~lh_8Z+pySP%So@S+94Qb;~1b5cmuNV+{*qeaX^DbWb+k zG+t+potQM%tGJLRJk?G}X??2o;NOut?))Sf-Tv;$aWl0Ml?x_5)w=VkinolsPqmXO z8KXb>1pcoHbndSJBQH=x;McNlYkTeb_c_*G%(@mABR^LfJ;}Ok@?mNe-v6K#w*H-x-$S3fn@k%iw zH3WVm>$X+Cigj7#OQq5Ctjj7tMGd*|sjsN%ShgPb&J{tsI}f$o$?9p6_)3(t=2Uaiw@lBO%z$>^((RF+fVpeCry|&5cXnU|aH;_Z%Hx0(%EU$sn8AFPbEyp=_XA{knoC^&)OM_KdFy0?h@x$>$ z|L}yq%7wsOns%f$6u52AUmCv`_GA{VQHE*Mfm&Lvs;AnXXIbWTsOrR8 zsc%mV?YdsJ%=}csoAG$IfBZD2pk$V0JR|VC)DlDN5;lcXjBXWG=kGw(mjeXWsv7<1X#tX6JnO9#P*x0By3vN?sNEmpGO%S|}$KtLW-&pBKZIPWl=>KMSme_eRdp7pX3F^?@ z&bxzEIYF*tX^^ej6Ae)+tk8}K8*UD4Z#ZXng z5z^=VFoj?cQqHmpr_doo;GadaT}IE{eQKNx`6KPLGMqS3XIeIK4UZKX=WnLgI_CsD zv04xOKYz1S<7=qB?6J(LQ}BP|hne&x&!StoCBijd)$m;QJvSGNAY!dDwI}_+-Ae)YB$=<|0WPR}mvQc=O=FCFZf?&u&J=x)yPIe3Ckv)h;vM+HjSsts%UcftK zozZoEFnFV$>?lkpdl>V`hM{qOu;%?A@sG3p`Oj&&Ut$%x^YISZM070-hF?)%7_6Cf z10NRp^U1Wb%P^1JOVC)@4L-sB)LwwqWHayq*(vC@AQ)zw`YgEG0g6nn%Wpbqx^%*W z8gHE6-q~Bjb)fHD3PjhT0TOT%yi~*G^t{Q#9W&(N-`cB&BeHG7)-m$%QWrLC!d1`u zKo^to>kaLxPX8m*pbXzTvJNhx^U*Nqi#?Ann^-_ELD?1QB%?Nu+vu^J+M11%I{ZZ$ z^tKI7U$lVRBq*yW-LASA?UEz@$cY~ z>F)6wXOFfz<*>h+sw#H7(p%xV=fY@xkZd&`J(ml+vFrKq5Qj_8C(77os2%`RZ=;Mp$1x7}nv8>THrbQM~|CFtR2a ze!>rGvgkN_oop@+xY!3q;54$~xPfd7es?h)_Ml5`Z!qG(+E|#2^J)h}CVpAlhqiH3 z?I23DbKMw^w&jqk;7yC_e$>D%99JI!U*YQdG|=Mt`a~Fv9WMt!GU_k)0|Wl)awu%W z6_%@ck4vBFK;A7}3 zR=BnPq4cZ8X4X3-x)xD|)#clYU`i)&5nrr> n2-l*Casox={oV(&6QKCwLx_P=v7Z1#pSp<=$Wf9x}QCZwTAv7A}F5(imK}87y2A3Bj#=TQvT#j0r zL`S1BLozc_I|*XO2+`1jieOYAX51ZH(Wpe9`kArcxmDFoO}}~HtMBvt_nv$I|D03z z7ImxLv9tY-o$U|0f&1FwoOG=YG(>fWZDf6MM%1UU4BJIV1RwDv@$_Ge!bqzyK_{etJ;$icuQFXC_AX3| z?hZxfh0$|0@Etbxh=6kZSC3Dj75DViyFPK{xYd<_CwlgT7x<{>hmeQw^(uvC^yoc8 zdvzAaCHkRm*NcFW|7xusya$C-1k7nSjz8`ZlT56|C-HqocXMuU`U@B|E9MnBP)=|JMlvL ztx_Y<-E+m+eIkO7KCsyYUUZ&dqY2fxzfXkgGHJp@tncFsYw{srie(VE|{au3sd4 zgHQWig28yEf25}+nw4{jEzT$Ss(+-v-({O^L%MC{dp29~b=nY**iZ^4C+OiCPELr1 zZ*fgRcM$Nag#NnmKTDHonzX#>_%tC}*ZJR_p4dCFyY71Pzs)?4^AZOG;^&E7pcsEl z?BSCsPiWEFH({b#lVpY-zKu4U(M0>Qlz$n)a;>J;6RBmfHeR&Zy@=P7{k#Pyofe!vz|WB3;1(&|Fg16( z#Lb9t;%=llQVyk~b%d0MhVp0$x0e&6Xjv|(%1M^Beqvk`ag=)E+q62hX>D|9-IrPx z>jJgbl?$w-2k`6pFP zk#Zi#SzJ|3`nEh`+wyqVp%tcRWvR7lf0AmN?WA>r<|s8KwrS}dTGynO#rpERDzAK5 z%hgG1Zktw0o7Rc0_8NC7T7Ob&`AAycUox($Mh_e^*v~N6!JVvdhpD;Wo|pFCC@1b$ z`0?QIv9)7aT))!Fq&=~SKm)Dn%+Bgyq^8dxkpMAvB{GDJ9XLLrCNhM(`G5I z#d@GYRdpbG5ApXoEYs)#k)L&+^Z5QygJGtFD=6GSYVN@Xe4Og%o#{j_!@Wbg8lH#R z;|@}|7wT1UGi2^H(xZGGfm0;zMhEwylmYEzHTOzAi|ez*iQ8B&B^~J??^VbeHMv+O zcW@%-%j9Evd)DI=^3HRrtUYD&XC$c3nwQ9-;~ivPA;+r8`|we!zt2D??kDG1)}bvS z_Q2&*{uZmHP8B#=;{HT(>bUU|*RaaL%~iN>sksex(lX6=BG=-|pwv(hr{pj^~RKR+uiQ-*_FqL9PXI!aSQFIbFHT8m4|5{#J0+#v8eorX zQpj}{RpeBe{4)uvBPYvblY=}!A?K*cO%^F~p%b~mLXm@TYo?FeZy7AQ-xK^><`B4# zzh(x&er!Lykq(SkhWGN?T}@$y^d@$m+Jc=%OoQ>bc*M_iVjuHHwfjd>bc^*h3>~S5 z56meeA824X_8uLjT~sCI`{+1Ft76T;oY6fX4mXef76rNpSx=RxSnI(MXYOeGx77K(Z929C75_KHCpD9ve#W|&Cx!rq+nG` zG%e$p?;`nF)P6oCQi@WzDsl>Z7+LykF!4cB*O%upTdG_xd@9d`SWaJ(+g|w)@(KK|K}s=OsUh%xWZkyPOIVjx zzE~PP#k#EW9s#TUB$kQKx8gacly8Y*t#Iy|UTXR2Kj3ZcoyXWnT_ZWP`~S zz>2v+9;SPq;>)^C*nVONZko_>_5u6sTG}COaw$0kek0lc5O@YtkOF7PfsfwZLOeO} z6uZ&QdN_&n^uGlBRRUYQ zST@fUP5WJ={RVA%dQ?CSYK*oBUejnu=vU4r2!2Nrad&p7BEggW~5CzBHEOISfC$MJ+&w857W zt|r_;_>Axfp^nbsO@uuOpA#AhJJB<;hA@$^hHw($L&Bwm9u34N)Ds>dTt)bc8&|?v zsqs5G3h2HEyK`JLeYg!IEFqjqc$9ECp$~mn?jZ~(tR(DDc#Uu`A@>@`{X!T@_&R-5 zrw|s_WUwb^$`Z9;TxqKMZzbI<;?M z4%s(wE!o@n8QISGBia6Vo94_%_l0_xiqT}>#7wd~F_-MuXd?Rx%gDN64cT*em#izg z7w91nqsflNOtKZ2OEwBk1$xZ~|G+or2l4x9xnE%oxfkMHvcu55P!IPox=^o~e+_>v z4C2#hWlJ!Z-2a89!Z14P{FU0pc$Vx)d_Z;*Nq(x~a(de2VeN2v_%~P8a7>ncSVKP+uxptc8#d#rr@bJ+ zY&y8fmFf&SG7HM^y(8=3BDz#W(8;WO#q!BT^kXKwV%y26&E+AOEw4_&cs7J@@K=~Dn_3j04B^in?-WR&K7|YW9zcu25zXE z03~>Z>;mk2t{05LS!APe6WLq%{kcr|GrHCHgb%S_eIgWKe*FN*!Y}H3(Kc?XPo_jW zHjMFZTMoGjH*;~rKQwR$$6bhl!?^lF2KeCV3n}#LtLMdF$iV1}aWDd>TnvX#aOK4) zk}SJe3e}i!sgQoFFT0cn2hqPV8(v~TV+f4Kjg1B>?oeYelww_DH!$FTH!h<>3!3`V z-uk>L58Zs(U2)l28hvU#+C~JnVsDA^vLtHF-yg( zQP4^3?G0Va1A^cPxW}*JquqRX_qpX4JHrneC@&`RU=k1Ik#mIj zA`gy3mRRvN^%jVbPjFbw%%>?OVp%@K1O_UP)NbY845r=c!)du2;$t=pbiQC0owKBC zx-xuKOj<}<%f!b2z%3kx6sJ`zm@ltXlRMFF@1+!U({$?GFF7n1jm=w3unE+!Sh zMu-z@Sg$~QQA9F3#neTVl0n?NhzR*&#UcuAzYQ5m=m2`TvCJ|>c!xMiV&*$AJ=WYz7y^xAA%jBkkN|i72X1=2L;wH) diff --git a/src/display.c b/src/display.c index 15f355d..49b64ed 100644 --- a/src/display.c +++ b/src/display.c @@ -117,7 +117,7 @@ void drawNumberToRenderer(SDL_Renderer* renderer, imgs data, int n, int X, int Y nIter--; } } else { - int toDraw = 0, remaining = -n, nIter = 1+ln_baseN(-n, 10); + int toDraw = 0, remaining = -n, nIter = ln_baseN(-n, 10); drawDigitToRenderer(renderer, data, -727, X, Y, W, H); while(nIter != 0) { toDraw = remaining%10; diff --git a/src/main.c b/src/main.c index 9b92fe0..10e07aa 100644 --- a/src/main.c +++ b/src/main.c @@ -43,7 +43,7 @@ int main(int argc, char** argv) { /* -------------------------------------------------------- */ //one_debug(); - parse_configs("templates.txt", 23); + parse_configs("templates.txt", 30); initialize(rend); diff --git a/src/move.c b/src/move.c index 266450f..09c4d09 100644 --- a/src/move.c +++ b/src/move.c @@ -25,7 +25,7 @@ double epsilon_x = 0.0; double epsilon_y = 0.0; bool checkCollision() { - return unpack_coord(gridGet(map, player_cx, player_cy)->chdata.lines, player_x, player_y); + return (unpack_coord(gridGet(map, player_cx, player_cy)->chdata.lines, player_x, player_y)); } void increment_x(double dx) { diff --git a/templates.txt b/templates.txt index 742487b..8bfcf24 100644 --- a/templates.txt +++ b/templates.txt @@ -34,6 +34,15 @@ 1 1 1 0 0 1 1 1 1 1 1 0 0 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 0 0 0 0 0 +1 1 1 0 0 0 0 0 +1 1 1 0 0 1 1 1 +1 1 1 0 0 1 1 1 +1 1 1 0 0 1 1 1 + 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 @@ -52,6 +61,15 @@ 1 1 1 0 0 1 1 1 1 1 1 0 0 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 +1 1 1 0 0 1 1 1 +1 1 1 0 0 1 1 1 +1 1 1 0 0 1 1 1 + 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 @@ -70,6 +88,15 @@ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0 1 1 @@ -205,6 +232,42 @@ 0 0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 +1 0 1 1 1 1 0 1 +1 0 0 0 0 0 0 0 +1 0 1 1 1 1 0 1 +0 0 1 1 1 1 0 1 +0 0 1 1 1 1 0 1 +1 0 1 1 1 1 0 1 +1 0 0 0 0 0 0 0 +1 1 1 1 1 1 1 1 + +1 0 1 1 1 1 0 1 +1 0 0 0 0 0 0 0 +1 0 1 1 1 1 0 1 +0 0 1 1 1 1 0 1 +0 0 1 1 1 1 0 1 +1 0 1 1 1 1 0 1 +1 0 0 0 0 0 0 0 +1 1 1 0 0 1 1 1 + +1 1 1 0 0 1 1 1 +0 0 0 0 0 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +0 0 0 0 0 1 1 1 +1 1 1 0 0 1 1 1 + +1 1 1 0 0 1 1 1 +0 0 0 0 0 0 1 1 +1 1 1 1 1 0 1 1 +1 1 1 1 1 0 0 0 +1 1 1 1 1 0 0 0 +1 1 1 1 1 0 1 1 +0 0 0 0 0 0 1 1 +1 1 1 0 0 1 1 1 + $ format is :