From 4af98f19bf8a77d08330674bf4fea80e20b104e8 Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Thu, 22 Dec 2022 14:55:40 +0100 Subject: [PATCH 01/16] basic structure added, pause working (p) --- Ui/screenIDs.h | 10 ++++++ animation.o | Bin 0 -> 2648 bytes animationHandler.o | Bin 0 -> 2432 bytes bucket.o | Bin 0 -> 1760 bytes game.c | 3 ++ game.h | 1 + game.o | Bin 0 -> 3744 bytes inputHandler.o | Bin 0 -> 6848 bytes isometricMap.o | Bin 0 -> 8056 bytes list.o | Bin 0 -> 6088 bytes main.c | 79 +++++++++++++++++++++++++++++++++++++++++++-- main.o | Bin 0 -> 4232 bytes mergeSort.o | Bin 0 -> 1376 bytes spiel | Bin 0 -> 36488 bytes sprite.o | Bin 0 -> 3672 bytes textureatlas.o | Bin 0 -> 5136 bytes 16 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 Ui/screenIDs.h create mode 100644 animation.o create mode 100644 animationHandler.o create mode 100644 bucket.o create mode 100644 game.o create mode 100644 inputHandler.o create mode 100644 isometricMap.o create mode 100644 list.o create mode 100644 main.o create mode 100644 mergeSort.o create mode 100755 spiel create mode 100644 sprite.o create mode 100644 textureatlas.o diff --git a/Ui/screenIDs.h b/Ui/screenIDs.h new file mode 100644 index 0000000..bf95efd --- /dev/null +++ b/Ui/screenIDs.h @@ -0,0 +1,10 @@ +#ifndef BUTTONIDS_H_ +#define BUTTONIDS_H_ + +#define SCREEN_EXIT 0 +#define SCREEN_MAINMENU 1 +#define SCREEN_OPTIONS 2 +#define SCREEN_GAME 3 +#define SCREEN_PAUSE 4 + +#endif \ No newline at end of file diff --git a/animation.o b/animation.o new file mode 100644 index 0000000000000000000000000000000000000000..75e4a759373d08db7729ffd8a67a6dde7cf7974f GIT binary patch literal 2648 zcmc&#&ubGw6rMD-joNA~9txF`Q>kFrL<-s>vTaDREzy?R926zp)YTS~O-MGKVB1H5eUWy3yeX}#oWD=p^!3UG~=6kd zVAoi4CQ-%)dz-e&O_TMrKKAqU@UM(j`(nNL9^ML*qXDN?OYB>98aq7HH_Z@t5xo0J zNsCyur;V*a^0lVcGYzX2)>Ew=6I~ea_A*wjx<{TptG1&SYglz=z1*%Q$wzi(-!Cl8 z`H&A&O=?+R2wAmx^d(y;lOh(v1c$!9_j|YaCO%egwN+NDQ97!rkWv{<2bw+6OhTb= zGtE?5wYn}$MPaTLH!q?1`GzO&M8{%PK8tN!iW<>zBX-`$aVSZ;Y2bh!qmjCiVO@-E z0}IlCob?q8JYHadwQyjluQ#+w7w#P47?8{ONt_D5>WcUGxD-HB_^tvcN#RHOH=6!C zz)3FR0!x2zB!CFyKY^1Z*5V)Ke&5sni_mWN9!Nc9Q`huLDRt&Qs>uCo$ zt~@$QM3C{9L_vHr$XRcN`)N9$tdny~*boi=khF%g*kAA~grknk=ih*^>jK{(4dL9A z&e1^pJ3$fW909hwTClyO>FiuGc{8z?U7VUuC$g+y=krA+ zG+DL_PQ2{co}=bhoU)fJ7hO*Wr|sp3d@X41pU;z|e;@dQ^+Rw*Rs0P{eY}rs8NVy` zgLoB>hjlrwk@m{IUXfPW$=inKta;41XL~j? za+L}*mWzdgLwp!+(Q^#Ci(?fJT=??`Zq+E2izT9Mof*7>vy#0Ja>WY%O+_djROu(% zBn!H!i=0$!)N#x=CAy?+h@7Jj}QbH(7vLZH&JA0glo)4@ORV8tL9+6)a Uoxd~W?3DjjtUs?Nldb3f0hB(;H~;_u literal 0 HcmV?d00001 diff --git a/animationHandler.o b/animationHandler.o new file mode 100644 index 0000000000000000000000000000000000000000..21f4c0199b4af28ebb7939fd4855839e1427820e GIT binary patch literal 2432 zcmbtV%}*0S6n||IP=PL{AtV^nlYvCmmT&-LWT9!hCXEoJ#u!am$^wOUOWJJ$#?KIq zwHJ=)$+IVp-h_BSZvF`#G--l~G37vv5#O7gX_sY*iN0j!z4^V*c{8*7IGTugJsuF` zfosrM2^4vALspomKnJu#&41x%QZ0W~*S-bS^26%;AS$b5pq8TtYK2C!s+J`ZcNB?f z7|M`}BB>kd_Gh2!`J`4rtuRzAPqbS00jh<>Isf;qn!i)&Uf=y-%PC>b11lXG)%=p$ zUGv}GCJ$z936g^7ovk_lzNW;;6lND1*?w2Qc(jB%t+%;7W@cI?e?g+#qkt@O8G!T+QgL1gf!kJ$a&eVKrK>S7$yZ~E-`EU>gEC!zYli*pAJUwkKt?StQ z^N7y+0<7|kg-b|$TP(v z$c4PMNau4o-9Vj@H+31`c7M^-(o1|jZ*n}HjyqrWTSs1Q&SD6e_$3?^ z^I!eL=u4^WcLJBN$@7bP2_tf@hY=&w5Gif+j{8%6cH(e-A7iK#nBDG+8|Y#?i5Pv& zob^|^e-L$ca@N0yN-}l&w{l>^?u@e2pKhVs`S;R~3Tc|n0CfKJ6&3#C{M~Ys%NvoO p?}NSxXI%U#rt|C(f+2qYDzvZ>4_8MzQF8Nt!Rr^_1L5HG{{u4QO2PmD literal 0 HcmV?d00001 diff --git a/bucket.o b/bucket.o new file mode 100644 index 0000000000000000000000000000000000000000..b9b0c0a4afcf74939a3528aaa23aa33fe49dfbb9 GIT binary patch literal 1760 zcmbtT&1(};5TDIQ8#OhlR0vkep2V*{lG20rAlrl_YY8^k1iVPt#MMgkMe+izP(2ic zkc)qUNB;zGwt7gt_2N}>5dwOVT#5*FX7{~jvu-asF#CS<+xgABee?EJI+yV&3P@An z9*iT&0=)H)v1UOHW*`is$ilCp-uAcnyKrH>-BT8zN=5|$nS-=Lsx?V6C@ z*Fugq18hST2fcj2TC|XIbT9~ZKiW}PIT}T7?vrv{IryF`eEtO4RBA=NUMzR&yrbS_ z%PhW_=vYzWKAP ztH_a)eWgeGV)V5yH8bV=f*C}38_g;JKTo{g`aLH}dy%`DRQavlPjVFbVd`(v;-}Bx zy*KQ)PGwSZ9>YtHeOlj+++}p@R!pYDtuuHicPd*ZXB9|V;C}r%hf+4To?Ok9)-#!n zbfHvOP3F=is2SC2qax~F5i8B;0{ZV0+f>2h{Ah+_W9^+9H_E`;yk)PO61B{#!MM52 zfju#}0j%6^1FJM@HM5Rfy}?a}cVe;4jmnmYpVd38*=jV+7T*D8RWLV8Pg_RK9QXVW zq@tGYha%A$n?a0oRnAUl8IvWjr!o(Gd36kbWedOdNe@*c28@E8o9_FTRV-D5) zSA7DtR5On5G})i(J5BbN>k7V<*qOKHMSA3}AxD47#2vyoFZ3#6r^)k^Tp0nSy7f(= zzataH>efF--fMm_kNJ^S>gD{rdQ+=+a{pqbf9ITso;dgHkb*<;K}!@kOq4riW)XSm NSU* literal 0 HcmV?d00001 diff --git a/game.c b/game.c index b57fe37..88940df 100644 --- a/game.c +++ b/game.c @@ -7,6 +7,7 @@ #include "IsometricMap/isometricMap.h" #include "Textures/textureatlas.h" #include "stdio.h" +#include "Ui/screenIDs.h" // returns pointer to new Game instance Game *GameInit() @@ -30,6 +31,8 @@ Game *GameInit() game->inputHandler->cursorTextures = game->textures->cursorTextures; game->inputHandler->cursorSprite = game->cursorSprite; + game->screen = SCREEN_GAME; + game->camera = malloc(sizeof(Camera2D)); game->camera->target.x = 0; game->camera->target.y = 0; diff --git a/game.h b/game.h index 855a416..ce274d9 100644 --- a/game.h +++ b/game.h @@ -11,6 +11,7 @@ typedef struct Game{ struct InputHandler *inputHandler; struct Camera2D *camera; struct IsometricMap **layers; + int screen; } Game; // returns pointer to new Game instance diff --git a/game.o b/game.o new file mode 100644 index 0000000000000000000000000000000000000000..df4b9e15e49b291c1d0c543f5bba0fc5d639a878 GIT binary patch literal 3744 zcmbuBO>7%Q6vt=d^gD?YT8T=Hz(Ccyl&qYzNQ5HlB-+H0+$L(`Qw70wHy;q&k-Ziz zBzA-)gyjMj7Y=a9u{Xl4aA?vN$&nCJgg9_;C4-EV$Vdp~1fmW9x1LGHn_WoYNi*~2 zH}l@SnRz>QMho^gC<+szuvgi3Pf*4@N49mpsrp$9Yi1knr~V8Da=(lOvcGzle#FQc zjRtbs+8t7Ay?kgbkb7@|2J+fkAU{v)S3jZp`aV{>3k4=cdGc+brI%1~fA>wxT!FlD zC!`ip>cF`Bx8)6Yo4-+-B-lY4)?~w4ZP+mzcHD-w+c1yBivE+EkQym0)CV8P4SS`z z0Xnz*Cv+4T@zF?eeic0z%F=OEmcv;F;`XFk_boHAZ<&dG6WegN?n8sN%`f&&ocpv} zrjahB?#36TL^i^EgYhoa?vKAjFwmHB1hrzESziG7cNf)JEcskIfx0s@jfFeX)|7sT}vYO zM-R~BiBx@^CuX&mr%?5j9DqZ%Aj~_5;ruLoE+d}VZz&cTm1n;Y3#LD>{|2hTJuW2$ zBp<@;J<9=@gM81kpP5$KZ@gDudw@vU{6#j<*Y~o=8@iT?87WVS}}ypc#x!8EkAI zIMmw{92@HIAJIm~MtgdL+8B$5r>El)Hmct+QVG4sm<}h+*&{QFDMRl|=wU-=!KtKS z(!pdrsvC)^$ffYi4$wClj!o#?)8O@?@zJSiogGDdB$SIyD1Xt9EaVx25aP`!f?p;G zA>M)_c!VIt>Svx3(1t(coE~0EYvJc80SNhVqX_PmxE$x(5~uqW^Ggz^oDlqJp4#MJ z=2so~rw;r(2mZ)``)EOkb=`;qKWzSq*f~Gtz&)mSM(>JQc$YCXc{6H+uc0*(wRTcy z34J=O8b~dsUJn~#rd~@XnVN{#I+1uZs>d)EiyOL%H>)FQgd=b9{zNRL&LrY9dcwE~ z8}g)2j*Taf&Ra|WAH@S>N)hXq?*}6h-+QfBn=5o`PoU7z`cY(A;ZM&B&p-NmPO5m3 z=+7a^DHP)TItiKbn4iDsinU|QOMpW zL+Fj%p5l{5#4p-j3<_PI=d)f2AGFTB0#2{LHGX05;dY`C=P&wiLLr}4`(eJmUrgk! z)t<7@?*0q(F9Ra(neLx{b%ed(c59Pefv>;FH%xC4xwP7oPwU+SF+ZR90d*v?o*%tU PcJ{Y<{Dx#ps@48)%ydq2 literal 0 HcmV?d00001 diff --git a/inputHandler.o b/inputHandler.o new file mode 100644 index 0000000000000000000000000000000000000000..08b81027ba010054724a4f3b382c1b54d62150b2 GIT binary patch literal 6848 zcmbtYZ)_Y#6`%8;)PUo)TL%IO^dyq#65Na3My-Mhod0aH0UKM6t)#+mx%k$}HTIo# zx99wU7NfIKRu>lwwNi@mAxH)CrK%+=5s*sGP9r=0fUZ&r{?I~%DA*)|R*sO1Opo82 zow*yYZ_^4!+S{4m`@J`B-kW)|_V@M90~J0Wlg-Dz%1R@NG8X!b(&ya}t7DtliuQ$n z_Z#-RhmFkLz>s!JUo`Az@=L@RGPGxNLt1=cMXT2rSG0izEik*HHRwwvu`#>qmz1{^ z%3UL?FTy}Pr*Lh3@t5rCUkZi7`FVSBXQ99fn;C0n_H}y^9agZf(^Pj?v?f015;}Q8 zV7ci%;YCxf)n2scx!GwW^LpT0--ed62&@6#+)^Es&cRmE|5e2&#ed9Oq^u2T|IBH7 z_0_Q_XkHrL)b`FMchhJUKjbgdj_`QUSf>d{g77T=gresdSR32NRiuGkG+J{RpfN3b zfFuq2-8%zC?OxGa9Wy*NKgu7Mb);sAr{-oUa6h;^1D_51wWG*R)W}xt4DhkO+LAM} zlY|=C@v9DYwS+iYy28mhoP`o+!9ns8$>e$rY=u%1kRuq-uVU??+7c}GR#8+>oNQ=E zX0>2F#{0$&N3A~Or>!Cf+iAOCkZ&c2u_|Y`%ufzu8J_@B>Mj2Rhb7Ae#zkYQ@dj6b zs^Nn}rM7v7m!Q zab3Ji`>QEuPoBBI!Ep+jW9X?#$IyUyllJ$ZO|dbidKyKHjC#X1_)=;Yi2B~F6whPtZ4a5GOj4t%1D84cYTd9-f6Xr387Fa-<=Oh~&;I@%@<~Flp z;N3{B6>Gu~;;yiCfz%xm;wnqB>2p>U1z z&9~e{&iW3Yf=%YqeWhKfZqBL_?B1L;q&v?`FZGOUPr!MHnvKj{qha@OMi$ns&vQv8 zS8HVZ!R)Pqk8~jCxOvqjZDPCx-)1pa7F+gTZK2fbB2DT5yvsldd_HfF%tk;r; z5Ep3^R42x9c5?RY><16GEZB3q-yjTvBDQSS(tpu&j^d^NU~r|d6LLXFr~ zUDK%ME;Cyc&Q{_)zmfAkU$qlraGHwohEXa&a^aWZ+;7$GXV`OCMb5Bq$ql*uGhxfX z?%#M-;yw}Cc(EnF8`mH&EtDUTkah3`H;!{@>sOXr9m7{}PAMeykWnA=)QE#dhnsGi z_k@UOR2oXO8dp(s`1b@Sdj^ZI*Y8mTsDsP7Dc?Co_RN zN-sIbL%%pyryij@rv-k=g@@@JT&4hCq!_PPY9rxGB)qgyxD%_Sm~dSzloxdgTq3}K z$2aYec*JKA@fk#X1`#KGHEKNOe1=%nJow7z3cmC3nYv`y>D#bhjdf$527T??5%ff+ ztS|BoE}j+bsjf9xByNcBDQAGMjcbQLj>6H|l0wHvD%8;Fk_t7~T0f4$KuKZx=5=Vu z)}6MxhuRY9cr?{vrmR>zV#N}1|KZWd={PGdl&bPQE<4WqTn9VY-u`8Op#OL}Zl(SE zgZqNbkF=!usO8y5n}f~!f-SopoK-=o9uLL%;5YjjYGjTuTuZz)ins4vFY}$L_id|v zpk^9d-Vc1cknwK^y{`U;744fh>6yxkUx6g#A;H;C$3$`}n|;I}{bNG@3MmxjKd&LV zAJ8}+YCP9cUhyYq0!LK#m!_*??-$AmE6e@`MQfI;UawWjqqH8QQ6-OBIsAc*Am`H} zH?~SfAFUf(CEK(Cq+C6y_|Ibx?6Y`C=5Bidl*2>7$&S?L`2p7D!9OPWA5vh^c)svH zg{PeTDG&Uo9{5cU{Er^^JrDc?4}25+F6ZYK5By6W_>;gXZZCfl6QS{aiTBq%_5hPw|OIIQ=D`&!#N^)NeVT3v~B%Iry` zVpJdqAbKQzV%RJy^HFCkZl>4>u@BK4>`*E(Vp_@AU{_?c{UkVMpLxbgC(T3A?xDUI z^i@VrGVwI|p<un>p_*2UXAOTFPUToX9?zeTbCjtBqG9(MbRmcrkr@ZV8z`reUtsz2o@QXEu%or0_U#}!=Ve@($v{s{$F z`J)Q1^8JoGy#7!QWa|(e!sxjn#!(k8zY8W@xV$G>Fm-msiX6w=N;>b8vX?Z6BS8yy z5(`EnR)htQr&27KOgMwV#K?#lhb*43%pkr|AK}-57@vrzgSaS0afO_P4p}l!hKJ}H z5T5*hFF(|&)QaOHTV2Yz{uwRs^21Ps(S(uyDjGLqk+=g-&p%0BcGZT4t4iY@kJy5)F%Cx z?=}c!U*#PW`YJ|!H@6oUl{B~iQr{1m+GPAC_B1+V)2%-)=D#e7;_cR_U05#vC#e{t z9pk@@Q8=k&N`0CCa&wc4pNccuRpA)9L#4*8Pd44T2gDXN`eiKQ3Ycri@Az{13&MZP KF;o0?>;D(K{U*l% literal 0 HcmV?d00001 diff --git a/isometricMap.o b/isometricMap.o new file mode 100644 index 0000000000000000000000000000000000000000..6881c0026fafcdee6457bdb86b87da5f93d0c5a3 GIT binary patch literal 8056 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 literal 0 HcmV?d00001 diff --git a/list.o b/list.o new file mode 100644 index 0000000000000000000000000000000000000000..b0440a79a14a385a239a9aebdc2cbb3ff08b88a9 GIT binary patch literal 6088 zcmb_gZEPGz8J_bcja!o3HJIkJ?SVpZOLDOrOEi4xK3IE8?bO6R0wL&fKCkUd?~A>? zq=`rfGATMvl>&bVQj5Z`M*N5nMUWp6y|@LtRRkv#Axq?ki;Cpn6x=vSrix_VXLe?9 zZhfmnz$@+U%rnpXG4sANbGq+n{k?5IACux^Uu2D*L>bdN8tn*gM%YHSfh`3d`!Jzb z{-#gf3h9+o^KWdS!Fdq$ingp*@g(N;N{~0FBkg<$@N^_7+i$<=Hbd-ry=vQd`3vB2 zn+xl0i;;G2ee%>YE5ENRgmW!SRmyXuHK$jm)wsC%v$gV8+f`!Oj*(zA2iq5l_5cDW zkUZ|2D(_uIW_)_p0~F9;yF!_1}a3dsSX4LVvEczSNj+GIR_2x2k2zyYx@Zd-`8&GI9q-?o`W*4I|WS zWn@~rf~5q1b}6u{_G#@(MWY$f9Gvc3=q^&XUe&Jn>J@DU00rs**A`Bbr#dYcjYNX9 zC?o~y?WD`*GMw}AFGP#s)t256Upf~#Evx=o-|_2+2@luc*-?Ge6%>-yxWIt!dV zzOu4%j_~DCeXpHxYb{@xrqURs(zq zQ$J&q+BF|Bs2*4~vU76T7dX4p1}29v^&O2irgoTHU2K4nP@}EWEN#La0vE^hK)xoU z8mI^M%p8jg@^oY;Vz7I`hK1M;3OXVH6%PULxH)16r#5HaVEv|HmVDH zT!&jx^>B4LdfV<_579e%f2GcS`lC!W^nOkqEE}Ra_Nk`1;g&)DVQz?A`dT<~9}4SK z1^qr09#9oFE3Vfl0}__kVq-USh@mRKt+26XNRRyf$v#b|Wb{;#bHtSls+2js@@Hif zr{R2c5VtmFPshU)%5aO_=V!nyodL6S1{}OgX8>IxtYj<~<_qtC% z-4*WY33oqf$}1Q!*O(zidsD4{iAC_sq(+2cETfcahw`nIoM*M5%bY6p$sf%M^} zZ4AED7T@r|X(CV;W1k03@*G}rye-BF7(Wc0@Atq*Jn$cQ z;4GUdS>ZJ6r%&88QkJp5Flw-5U;p#5Xn*qg-rgZ?I5`}R^=nC%OJ%bKn>%P`@>Xxb zJf1Q~S+Q)DxP@o)CBw9O%|hN%`mt2{1<}pe_?OJo@n|+XR5UY|QDV=Q3OU0vGwFd; zanLLrHPROAGpwPsX&Cu~nNe$^(bbL2_=Lq^!B!tG94wgGQI<@WEOL}gPrQ&EOJ%a$ zV>E3ke#mC8naUZ%nViACN?r=))BQ$%oa~F<{(?!9%$#(FhtjF6(~0KCsT0j-aw#iQ z$j2vA`EkSPGCQ6`agqgN_#p=4d8Q{N_a<-aw&bC5lDEgaTua zP@O?gmh0)ETZan`al!UkOOM2l+A!yDRPdJsF8RXDO4WmZNx>gd>>Q9h4~c#3 zj`Na&f0T4&oUbc5?ktJ_L%~)4T?PM`!Vin18h%y&UIka}M-^PPQ&Mo%P8fzs@IfwQ zoQD(~XRgG*rQll?{Di4!uHfHQaNLQK|1Sl9RKXtEa_+$d5hvzjX0KoXyxDJ@|ij@plUT zI&tN?A;dPksQMww()u<6b{K}_d=R5A9NYr$My R_OOS3UBqv}m?Ccd{{Szbck}=N literal 0 HcmV?d00001 diff --git a/main.c b/main.c index 403d896..389fe9b 100644 --- a/main.c +++ b/main.c @@ -9,6 +9,7 @@ #include "game.h" #include "DepthSorting/bucket.h" #include "DepthSorting/mergeSort.h" +#include "Ui/screenIDs.h" int main(){ @@ -19,8 +20,10 @@ int main(){ // Hides the operating systems own cursor HideCursor(); - //SetTargetFPS(60); - + SetTargetFPS(60); + + + return uitest(game); // GAME MAIN ROUTINE while(!WindowShouldClose()){ @@ -59,4 +62,74 @@ int main(){ } - \ No newline at end of file +int uitest(Game * game){ + + while(!WindowShouldClose()){ + + // Moving cursor Sprite to Mouse Pos + game->cursorSprite->x = GetMousePosition().x; + game->cursorSprite->y = GetMousePosition().y; + + switch(game->screen){ + case SCREEN_EXIT: + return 0; + case SCREEN_MAINMENU: + printf("MAINMENU \n"); + return 0; + case SCREEN_OPTIONS: + printf("OPTIONS \n"); + return 0; + case SCREEN_GAME: + + ListActAllSprites(game); + + ClearBackground(RAYWHITE); + BeginDrawing(); + + BeginMode2D(*(game->camera)); + + //IsometricRendererRenderIsometricMap(game); + //ListDrawAllSprites(game->sprites, game->layers, game->camera); + IsometricMapDraw(game); + + EndMode2D(); + + DrawSpriteToScreen(game->cursorSprite); + + // User Input Handling + mouseInput(game); + keyboardInput(game->inputHandler, game->camera); + + DrawFPS(GetScreenWidth() - 95, 10); + + EndDrawing(); + + if(IsKeyPressed(KEY_P)){ + game->screen = SCREEN_PAUSE; + } + + break; + case SCREEN_PAUSE: + ClearBackground(RAYWHITE); + + BeginDrawing(); + + DrawSpriteToScreen(game->cursorSprite); + DrawFPS(GetScreenWidth() - 95, 10); + + EndDrawing(); + + if(IsKeyPressed(KEY_P)){ + game->screen = SCREEN_GAME; + } + break; + } + + + + } + + CloseWindow(); + + return 0; +} \ No newline at end of file diff --git a/main.o b/main.o new file mode 100644 index 0000000000000000000000000000000000000000..014bd998633ddf79fb3872f25e4da726aef8de6e GIT binary patch literal 4232 zcmbuBU2GIp6oAj}7N`pB@}r^%4vGd78C%k55GC7|ZD+&w2eyUyV9IoNXjgV;nwi-^ zNkmLRJFe9}n&^Y^K}}42@r4HiwWx&`~>E^x?!&7u)JLRqgl%G#Z<4NWS?!#^_CH6KhW*0c~Ol zHMNGg_8!kdi(S}Rzsv%=`XwrB6EBhqTgay$htf%+6rnf6bicTH>Sn!OAD{6qK2fhj zeFeZx@XmS{u>*DNTw-eM=4UoOg)^9ZqhEmEv|3E7?P=7!rJA>|QLDA4G_S+YSR4CV zkr$J^u=3fm$EEqe}i-7e`OeIfvWQ7i9SWz2r zG&lNf=8B(gt?SD8H?RLp347;Q%6__;E3!jBlsh8*SBtxA78k~C26KtYx!9y{`ezJ- zJNe!1dYz5gqta?G&!0aFgSt~HD2GdC(K-xWt=aCbOn1KmJ-vO|p6W2!?6FWOI?-Ti<&cZwK=NwU^&Aa-;w z#Ezt5>z6NUq%HFZa=J+N(k-(x^+vpX#nN~dH2^jvqPK?RC3LzlpBYOecE_0xn~b>O z63_tG>tWN0&^Ml97E#}6l|WBnl3-ciJ(B=TAVd;yPY9)TY3JQ730QU)B+sj*_*w0c z(RQQf5R}IegmE>3KNrEtz~DjMxo+p%oO8*ZO&4;gMpZyu^8*Kl0uG~6z$>KMJ2Q*uj| z2_se4fn3RPTMKS$xtt%dNfFx1hHkg%g+oKORW*yyW(<|gUAB&A)Q~^uvWmvGU66IG zis9O&LYF>5^N=x%e2Rv?zdkEpunoh63ayL=r~M)LD-vHN@$m?Lo^uhuID=_llLYxSA1`omf?emF z@?DLWh$oKwjzsub;}2mO=Rtkiza+#-SNPc_ar%Y`o|QQLeF=V4;txptEr~xU@pmP@ zPU0U){2_^dF7byYPXART6#sg>L_9x8oN6riFB0D%@mYz}UK09$N&HcXw@`smXkEEJ z+a)g7Cns?^uRRi%<2)d7IZi|3a-5dL=i3TW}{bqsx z&d1{Y68d7FJsr^B#Ov4;;2U`yN`Uhrqyt=h=RkEvE3Q6>t!w-3u;|%FSyx@-hzn{_ zcXdz)9S2lKZObPGt5PvcR4^^qQ1QoUtK;Ia$j3uwRUNUd5yN&zxuG#UaL~rnSj6>z zTLm3ZNtOm2rTO?XUKcUV%O{3xuhZU3FA%?zrXLiP1N>Kt&O)-~80cLic@i(;!9T9K zz`CSM5?r62FZukh_Rn&k!R4-T(1P=_P_DAj`5l)3hxhqfN4PTOPv41P{yULTPGUb| zmx;m?68l$hk-um=aYFQk4z;;pLHJ})cRzCayA0;v%k33zCmIpI7+csOpF#T(Zht^1 z@-}Es->tCvt)qgWh`P{_{*Hyc*gs)wlidZreiLu$n;T|N-!ZO2W{W~aLD>-~SYQbB Rtqrr+c>JTx%i=9){}0`y*8%_l literal 0 HcmV?d00001 diff --git a/mergeSort.o b/mergeSort.o new file mode 100644 index 0000000000000000000000000000000000000000..84c8b38d95d81d7c03e6a07d9a40100b8de13939 GIT binary patch literal 1376 zcmbtTPfHs?6n~qIf2(a2LBUeusVy`^A_~@n1VS`I^$-bok-AC81nO>NcNSF8dJ=N; zBluASFMb4%Uc6iCA@ow;+nq@!W4zP{Z{B;q_kQ!{?aclvep^jg7AUb`1-g+!0d^Bz zKOeby7=t(P=iP_Dl~U`z)H-Rm!pDo9Ygj83meZdq)zA}R`YT&t*-S2sqTK0xmSq=M z?sJUeK1tLR>HzB6W(Ba#6=60i$y98>Ixd5Cn6hTahK4WjfbS6}C7Gn9_%?N(D2xxT zV*$l42+fv+-~alh?Y@)KS+wCbqTM;A2BK?6)AV8#*)aGVjPRisaQYIxGLGS-cFt&a zDsj1A=UYu*uo`SAA0SOR6q=xC3Kkr>!l?oagdf|6@&rE=z}at|@D zDLBJx$^^ox{giRt3)z9+Jm9`K0_O95hw;YuJ>PM8)cRG+EVAj&%rBRhyLRT6G1cla zhXG;gJ*iw-Ifga)A2Cnw>3{iOkV|`JQFT%MDX)v_uk0cwm9N*G>Vf8)wMER)>*~3C zjL%R>($U&o%ztMGQ?#eazm$|EX_Ybg+nAtNoL2?X-pPZ`$an-Tom24@-mf=NZfQYz nhz*RQr9DhOVdmWtVR9h3hAg#A`# literal 0 HcmV?d00001 diff --git a/spiel b/spiel new file mode 100755 index 0000000000000000000000000000000000000000..36d4062c66bce471abe1e69ac324c88905740a65 GIT binary patch literal 36488 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 literal 0 HcmV?d00001 diff --git a/sprite.o b/sprite.o new file mode 100644 index 0000000000000000000000000000000000000000..83d073c4088c4495d0151ccfeb11655919f996e9 GIT binary patch literal 3672 zcmbtX|7%-S6u)V@EzYgUW*vnMeM2YN*g`u8ZlaR3dF?HBZnn)Fx|zKuuWQ!krM$jq zr%ZpSlU|;a{skib>MvvShbgFCH~IyNL?}|lABxUdoIg|wT12Sl+%L)NTY@kT+}v|N z_k6qOo^v00SMO@C3j~Ow0C|B_RthC#achN-b2d&I$ab+w@gx3UtA4G;t^!18xOhh`ql7(+12owo2%g+`jQf8tO$hI z)Xm=>50t)L^Ge=90e7?stm$`F!w11cL|+1?)O7{T6lX!8)E~BHD4SWvV7UN*C`m(Q zkKBNQw<%bdk4G<0I&UOCTfeamlw?1T&m`E7Nw&0|kadz^w}IUUJCFlHW?{{ZttP_< zC%HEWXAR?|E)79ua5PbNm%0J!z8s=#Gi9ejZX&|kBT4pCl1=kK>DX=UUgo-RIzGb| zxi@x;Gi06JdT=l72d|R}h;2DbpB6XdY!cqDm@BU(&YT4=;#ToaA?i!Z)IGlJc1ADH zIm6dvaMP?Lf}3KcN+Q@48ipw2jXW1>6_NP>OYx2Q2vPSm; z!1x09hS^@HZVFwrDi>lUU8KN8_eK|6srzc#MR$aqim)kPGS05el}`s7YkY`A+r1p0aI{k| z3yj|>V4v2Izg7ePyaxVF4V;YdMvG-g(l*`{UDsQ9rC<+bNxGx!L~EieeWJa+NAFGd zCR)4nH0c~E3i2@CF~^ zRVCNwtzrynZ`ib*i=cy+%z<>jZRD{d|37J90En>Xi8uDegJR)C!EN_~vaODcXfx5B34y>dIT3967^wi{&dYvYfmQZ+AOD9wR$;aKC-Q&PIjN8Lk6$_EU)_H-->9-E{YPbB_@<#rzdqXZ-#tKO!SDH^ W^5f4RzD?Ei&&l|miYn*)`u_sI;|0F} literal 0 HcmV?d00001 diff --git a/textureatlas.o b/textureatlas.o new file mode 100644 index 0000000000000000000000000000000000000000..ddd110bbe7d610d4ffe601c5132a5f1e973b3a2c GIT binary patch literal 5136 zcmd5=TWnNC7@pm2X;GjnA{RkZ9*QNQOA93iMY6OxWk?!YDI1BTSq{6~c4aU1>^X7? zSk1DAlg(liV}f8}^+g_hAn~PwgvDYPqQ*X%n)uK}O$x0^iI@;HS^s~|%y#y0)_^94 zKbbQ#-+cdNZvSjMq;z(;T`nTTMYfaqo@X%^Au(Iz!74-|_<`%FgFR4SsUHXf!I zliHz(w(+nE>p4QrzMJN;f|-Jn#|WXm&g%)R3(6!`K>CS&&k!=M zoCWxtZ!pn6u6#ranIqtzaWgt^-Sk%xl6@ZsV13TauP5_pO(z!^fw8>20=WQC?a(mo#}=S?D&<(V3I8MG@G*P=67yFEWhr$%vl(PP~W1ta+?V8WBX8{ zrDto4#&FR%RWwQlX!=?`%z}mP93;)Xgj-P-=DJdtRgZF*Ly$78)m-o>hl%&W3bV$D zJ=Bic4#q$3<9&y1CiFk}8iyn>uAG7S;Z1(d*a`=Fgnm)VC6}yRV#KLgOU-??FcgC1 zl4v5-q~7^VFtg3F&}D3Pwh)eT3w;H@H_|ljUn=F1G`rz0%S3CgWx7M)XKw)gIQ zW{1QM4}z803(6c`gMz{?!p(P~4Jp-B=A;A!&rABmT-VUTf^w%C2s1U%@Gz}e_>!3| zS!K>Sk0=w=1?dDHq4{Sft<2S?m04F-nSD{Yb9@Z^QAlUYzD8TXoh+%i)5^3fePVh= z-RXW<=HcNRV|;}}hL%cdzW!(*DMNzcwEcI2IJ}ONg?>`;NPP@dEdLU=UId&^E+DuH#3HD`}7WBBLgk2-$}{j=w~3&SKW(8XmSvnq?VC0w4@XA-_#vOg)|DzP%<8mBw#F&)FVFltRbkU}KCZJ1%|5ofs zV)wrl#t>_kIM{rH$B*&JBJ@Sw27{t4^FDdN`R@TGq}t;@&-LqNqtF)XFW}dpf&T6K z*SY?PAoAL-kEhUS|3~q013AFHgy8<;uR)#_d c4#^-jw#Bt|3FZzb{gs%UKy<4reeL>x1NLekqW}N^ literal 0 HcmV?d00001 From 19bedf5b57045d1766b8570138488ff831d2b34b Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Thu, 22 Dec 2022 14:55:55 +0100 Subject: [PATCH 02/16] make clean --- animation.o | Bin 2648 -> 0 bytes animationHandler.o | Bin 2432 -> 0 bytes bucket.o | Bin 1760 -> 0 bytes game.o | Bin 3744 -> 0 bytes inputHandler.o | Bin 6848 -> 0 bytes isometricMap.o | Bin 8056 -> 0 bytes list.o | Bin 6088 -> 0 bytes main.o | Bin 4232 -> 0 bytes mergeSort.o | Bin 1376 -> 0 bytes spiel | Bin 36488 -> 0 bytes sprite.o | Bin 3672 -> 0 bytes textureatlas.o | Bin 5136 -> 0 bytes 12 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 animation.o delete mode 100644 animationHandler.o delete mode 100644 bucket.o delete mode 100644 game.o delete mode 100644 inputHandler.o delete mode 100644 isometricMap.o delete mode 100644 list.o delete mode 100644 main.o delete mode 100644 mergeSort.o delete mode 100755 spiel delete mode 100644 sprite.o delete mode 100644 textureatlas.o diff --git a/animation.o b/animation.o deleted file mode 100644 index 75e4a759373d08db7729ffd8a67a6dde7cf7974f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2648 zcmc&#&ubGw6rMD-joNA~9txF`Q>kFrL<-s>vTaDREzy?R926zp)YTS~O-MGKVB1H5eUWy3yeX}#oWD=p^!3UG~=6kd zVAoi4CQ-%)dz-e&O_TMrKKAqU@UM(j`(nNL9^ML*qXDN?OYB>98aq7HH_Z@t5xo0J zNsCyur;V*a^0lVcGYzX2)>Ew=6I~ea_A*wjx<{TptG1&SYglz=z1*%Q$wzi(-!Cl8 z`H&A&O=?+R2wAmx^d(y;lOh(v1c$!9_j|YaCO%egwN+NDQ97!rkWv{<2bw+6OhTb= zGtE?5wYn}$MPaTLH!q?1`GzO&M8{%PK8tN!iW<>zBX-`$aVSZ;Y2bh!qmjCiVO@-E z0}IlCob?q8JYHadwQyjluQ#+w7w#P47?8{ONt_D5>WcUGxD-HB_^tvcN#RHOH=6!C zz)3FR0!x2zB!CFyKY^1Z*5V)Ke&5sni_mWN9!Nc9Q`huLDRt&Qs>uCo$ zt~@$QM3C{9L_vHr$XRcN`)N9$tdny~*boi=khF%g*kAA~grknk=ih*^>jK{(4dL9A z&e1^pJ3$fW909hwTClyO>FiuGc{8z?U7VUuC$g+y=krA+ zG+DL_PQ2{co}=bhoU)fJ7hO*Wr|sp3d@X41pU;z|e;@dQ^+Rw*Rs0P{eY}rs8NVy` zgLoB>hjlrwk@m{IUXfPW$=inKta;41XL~j? za+L}*mWzdgLwp!+(Q^#Ci(?fJT=??`Zq+E2izT9Mof*7>vy#0Ja>WY%O+_djROu(% zBn!H!i=0$!)N#x=CAy?+h@7Jj}QbH(7vLZH&JA0glo)4@ORV8tL9+6)a Uoxd~W?3DjjtUs?Nldb3f0hB(;H~;_u diff --git a/animationHandler.o b/animationHandler.o deleted file mode 100644 index 21f4c0199b4af28ebb7939fd4855839e1427820e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2432 zcmbtV%}*0S6n||IP=PL{AtV^nlYvCmmT&-LWT9!hCXEoJ#u!am$^wOUOWJJ$#?KIq zwHJ=)$+IVp-h_BSZvF`#G--l~G37vv5#O7gX_sY*iN0j!z4^V*c{8*7IGTugJsuF` zfosrM2^4vALspomKnJu#&41x%QZ0W~*S-bS^26%;AS$b5pq8TtYK2C!s+J`ZcNB?f z7|M`}BB>kd_Gh2!`J`4rtuRzAPqbS00jh<>Isf;qn!i)&Uf=y-%PC>b11lXG)%=p$ zUGv}GCJ$z936g^7ovk_lzNW;;6lND1*?w2Qc(jB%t+%;7W@cI?e?g+#qkt@O8G!T+QgL1gf!kJ$a&eVKrK>S7$yZ~E-`EU>gEC!zYli*pAJUwkKt?StQ z^N7y+0<7|kg-b|$TP(v z$c4PMNau4o-9Vj@H+31`c7M^-(o1|jZ*n}HjyqrWTSs1Q&SD6e_$3?^ z^I!eL=u4^WcLJBN$@7bP2_tf@hY=&w5Gif+j{8%6cH(e-A7iK#nBDG+8|Y#?i5Pv& zob^|^e-L$ca@N0yN-}l&w{l>^?u@e2pKhVs`S;R~3Tc|n0CfKJ6&3#C{M~Ys%NvoO p?}NSxXI%U#rt|C(f+2qYDzvZ>4_8MzQF8Nt!Rr^_1L5HG{{u4QO2PmD diff --git a/bucket.o b/bucket.o deleted file mode 100644 index b9b0c0a4afcf74939a3528aaa23aa33fe49dfbb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1760 zcmbtT&1(};5TDIQ8#OhlR0vkep2V*{lG20rAlrl_YY8^k1iVPt#MMgkMe+izP(2ic zkc)qUNB;zGwt7gt_2N}>5dwOVT#5*FX7{~jvu-asF#CS<+xgABee?EJI+yV&3P@An z9*iT&0=)H)v1UOHW*`is$ilCp-uAcnyKrH>-BT8zN=5|$nS-=Lsx?V6C@ z*Fugq18hST2fcj2TC|XIbT9~ZKiW}PIT}T7?vrv{IryF`eEtO4RBA=NUMzR&yrbS_ z%PhW_=vYzWKAP ztH_a)eWgeGV)V5yH8bV=f*C}38_g;JKTo{g`aLH}dy%`DRQavlPjVFbVd`(v;-}Bx zy*KQ)PGwSZ9>YtHeOlj+++}p@R!pYDtuuHicPd*ZXB9|V;C}r%hf+4To?Ok9)-#!n zbfHvOP3F=is2SC2qax~F5i8B;0{ZV0+f>2h{Ah+_W9^+9H_E`;yk)PO61B{#!MM52 zfju#}0j%6^1FJM@HM5Rfy}?a}cVe;4jmnmYpVd38*=jV+7T*D8RWLV8Pg_RK9QXVW zq@tGYha%A$n?a0oRnAUl8IvWjr!o(Gd36kbWedOdNe@*c28@E8o9_FTRV-D5) zSA7DtR5On5G})i(J5BbN>k7V<*qOKHMSA3}AxD47#2vyoFZ3#6r^)k^Tp0nSy7f(= zzataH>efF--fMm_kNJ^S>gD{rdQ+=+a{pqbf9ITso;dgHkb*<;K}!@kOq4riW)XSm NSU* diff --git a/game.o b/game.o deleted file mode 100644 index df4b9e15e49b291c1d0c543f5bba0fc5d639a878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3744 zcmbuBO>7%Q6vt=d^gD?YT8T=Hz(Ccyl&qYzNQ5HlB-+H0+$L(`Qw70wHy;q&k-Ziz zBzA-)gyjMj7Y=a9u{Xl4aA?vN$&nCJgg9_;C4-EV$Vdp~1fmW9x1LGHn_WoYNi*~2 zH}l@SnRz>QMho^gC<+szuvgi3Pf*4@N49mpsrp$9Yi1knr~V8Da=(lOvcGzle#FQc zjRtbs+8t7Ay?kgbkb7@|2J+fkAU{v)S3jZp`aV{>3k4=cdGc+brI%1~fA>wxT!FlD zC!`ip>cF`Bx8)6Yo4-+-B-lY4)?~w4ZP+mzcHD-w+c1yBivE+EkQym0)CV8P4SS`z z0Xnz*Cv+4T@zF?eeic0z%F=OEmcv;F;`XFk_boHAZ<&dG6WegN?n8sN%`f&&ocpv} zrjahB?#36TL^i^EgYhoa?vKAjFwmHB1hrzESziG7cNf)JEcskIfx0s@jfFeX)|7sT}vYO zM-R~BiBx@^CuX&mr%?5j9DqZ%Aj~_5;ruLoE+d}VZz&cTm1n;Y3#LD>{|2hTJuW2$ zBp<@;J<9=@gM81kpP5$KZ@gDudw@vU{6#j<*Y~o=8@iT?87WVS}}ypc#x!8EkAI zIMmw{92@HIAJIm~MtgdL+8B$5r>El)Hmct+QVG4sm<}h+*&{QFDMRl|=wU-=!KtKS z(!pdrsvC)^$ffYi4$wClj!o#?)8O@?@zJSiogGDdB$SIyD1Xt9EaVx25aP`!f?p;G zA>M)_c!VIt>Svx3(1t(coE~0EYvJc80SNhVqX_PmxE$x(5~uqW^Ggz^oDlqJp4#MJ z=2so~rw;r(2mZ)``)EOkb=`;qKWzSq*f~Gtz&)mSM(>JQc$YCXc{6H+uc0*(wRTcy z34J=O8b~dsUJn~#rd~@XnVN{#I+1uZs>d)EiyOL%H>)FQgd=b9{zNRL&LrY9dcwE~ z8}g)2j*Taf&Ra|WAH@S>N)hXq?*}6h-+QfBn=5o`PoU7z`cY(A;ZM&B&p-NmPO5m3 z=+7a^DHP)TItiKbn4iDsinU|QOMpW zL+Fj%p5l{5#4p-j3<_PI=d)f2AGFTB0#2{LHGX05;dY`C=P&wiLLr}4`(eJmUrgk! z)t<7@?*0q(F9Ra(neLx{b%ed(c59Pefv>;FH%xC4xwP7oPwU+SF+ZR90d*v?o*%tU PcJ{Y<{Dx#ps@48)%ydq2 diff --git a/inputHandler.o b/inputHandler.o deleted file mode 100644 index 08b81027ba010054724a4f3b382c1b54d62150b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6848 zcmbtYZ)_Y#6`%8;)PUo)TL%IO^dyq#65Na3My-Mhod0aH0UKM6t)#+mx%k$}HTIo# zx99wU7NfIKRu>lwwNi@mAxH)CrK%+=5s*sGP9r=0fUZ&r{?I~%DA*)|R*sO1Opo82 zow*yYZ_^4!+S{4m`@J`B-kW)|_V@M90~J0Wlg-Dz%1R@NG8X!b(&ya}t7DtliuQ$n z_Z#-RhmFkLz>s!JUo`Az@=L@RGPGxNLt1=cMXT2rSG0izEik*HHRwwvu`#>qmz1{^ z%3UL?FTy}Pr*Lh3@t5rCUkZi7`FVSBXQ99fn;C0n_H}y^9agZf(^Pj?v?f015;}Q8 zV7ci%;YCxf)n2scx!GwW^LpT0--ed62&@6#+)^Es&cRmE|5e2&#ed9Oq^u2T|IBH7 z_0_Q_XkHrL)b`FMchhJUKjbgdj_`QUSf>d{g77T=gresdSR32NRiuGkG+J{RpfN3b zfFuq2-8%zC?OxGa9Wy*NKgu7Mb);sAr{-oUa6h;^1D_51wWG*R)W}xt4DhkO+LAM} zlY|=C@v9DYwS+iYy28mhoP`o+!9ns8$>e$rY=u%1kRuq-uVU??+7c}GR#8+>oNQ=E zX0>2F#{0$&N3A~Or>!Cf+iAOCkZ&c2u_|Y`%ufzu8J_@B>Mj2Rhb7Ae#zkYQ@dj6b zs^Nn}rM7v7m!Q zab3Ji`>QEuPoBBI!Ep+jW9X?#$IyUyllJ$ZO|dbidKyKHjC#X1_)=;Yi2B~F6whPtZ4a5GOj4t%1D84cYTd9-f6Xr387Fa-<=Oh~&;I@%@<~Flp z;N3{B6>Gu~;;yiCfz%xm;wnqB>2p>U1z z&9~e{&iW3Yf=%YqeWhKfZqBL_?B1L;q&v?`FZGOUPr!MHnvKj{qha@OMi$ns&vQv8 zS8HVZ!R)Pqk8~jCxOvqjZDPCx-)1pa7F+gTZK2fbB2DT5yvsldd_HfF%tk;r; z5Ep3^R42x9c5?RY><16GEZB3q-yjTvBDQSS(tpu&j^d^NU~r|d6LLXFr~ zUDK%ME;Cyc&Q{_)zmfAkU$qlraGHwohEXa&a^aWZ+;7$GXV`OCMb5Bq$ql*uGhxfX z?%#M-;yw}Cc(EnF8`mH&EtDUTkah3`H;!{@>sOXr9m7{}PAMeykWnA=)QE#dhnsGi z_k@UOR2oXO8dp(s`1b@Sdj^ZI*Y8mTsDsP7Dc?Co_RN zN-sIbL%%pyryij@rv-k=g@@@JT&4hCq!_PPY9rxGB)qgyxD%_Sm~dSzloxdgTq3}K z$2aYec*JKA@fk#X1`#KGHEKNOe1=%nJow7z3cmC3nYv`y>D#bhjdf$527T??5%ff+ ztS|BoE}j+bsjf9xByNcBDQAGMjcbQLj>6H|l0wHvD%8;Fk_t7~T0f4$KuKZx=5=Vu z)}6MxhuRY9cr?{vrmR>zV#N}1|KZWd={PGdl&bPQE<4WqTn9VY-u`8Op#OL}Zl(SE zgZqNbkF=!usO8y5n}f~!f-SopoK-=o9uLL%;5YjjYGjTuTuZz)ins4vFY}$L_id|v zpk^9d-Vc1cknwK^y{`U;744fh>6yxkUx6g#A;H;C$3$`}n|;I}{bNG@3MmxjKd&LV zAJ8}+YCP9cUhyYq0!LK#m!_*??-$AmE6e@`MQfI;UawWjqqH8QQ6-OBIsAc*Am`H} zH?~SfAFUf(CEK(Cq+C6y_|Ibx?6Y`C=5Bidl*2>7$&S?L`2p7D!9OPWA5vh^c)svH zg{PeTDG&Uo9{5cU{Er^^JrDc?4}25+F6ZYK5By6W_>;gXZZCfl6QS{aiTBq%_5hPw|OIIQ=D`&!#N^)NeVT3v~B%Iry` zVpJdqAbKQzV%RJy^HFCkZl>4>u@BK4>`*E(Vp_@AU{_?c{UkVMpLxbgC(T3A?xDUI z^i@VrGVwI|p<un>p_*2UXAOTFPUToX9?zeTbCjtBqG9(MbRmcrkr@ZV8z`reUtsz2o@QXEu%or0_U#}!=Ve@($v{s{$F z`J)Q1^8JoGy#7!QWa|(e!sxjn#!(k8zY8W@xV$G>Fm-msiX6w=N;>b8vX?Z6BS8yy z5(`EnR)htQr&27KOgMwV#K?#lhb*43%pkr|AK}-57@vrzgSaS0afO_P4p}l!hKJ}H z5T5*hFF(|&)QaOHTV2Yz{uwRs^21Ps(S(uyDjGLqk+=g-&p%0BcGZT4t4iY@kJy5)F%Cx z?=}c!U*#PW`YJ|!H@6oUl{B~iQr{1m+GPAC_B1+V)2%-)=D#e7;_cR_U05#vC#e{t z9pk@@Q8=k&N`0CCa&wc4pNccuRpA)9L#4*8Pd44T2gDXN`eiKQ3Ycri@Az{13&MZP KF;o0?>;D(K{U*l% diff --git a/isometricMap.o b/isometricMap.o deleted file mode 100644 index 6881c0026fafcdee6457bdb86b87da5f93d0c5a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8056 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 diff --git a/list.o b/list.o deleted file mode 100644 index b0440a79a14a385a239a9aebdc2cbb3ff08b88a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6088 zcmb_gZEPGz8J_bcja!o3HJIkJ?SVpZOLDOrOEi4xK3IE8?bO6R0wL&fKCkUd?~A>? zq=`rfGATMvl>&bVQj5Z`M*N5nMUWp6y|@LtRRkv#Axq?ki;Cpn6x=vSrix_VXLe?9 zZhfmnz$@+U%rnpXG4sANbGq+n{k?5IACux^Uu2D*L>bdN8tn*gM%YHSfh`3d`!Jzb z{-#gf3h9+o^KWdS!Fdq$ingp*@g(N;N{~0FBkg<$@N^_7+i$<=Hbd-ry=vQd`3vB2 zn+xl0i;;G2ee%>YE5ENRgmW!SRmyXuHK$jm)wsC%v$gV8+f`!Oj*(zA2iq5l_5cDW zkUZ|2D(_uIW_)_p0~F9;yF!_1}a3dsSX4LVvEczSNj+GIR_2x2k2zyYx@Zd-`8&GI9q-?o`W*4I|WS zWn@~rf~5q1b}6u{_G#@(MWY$f9Gvc3=q^&XUe&Jn>J@DU00rs**A`Bbr#dYcjYNX9 zC?o~y?WD`*GMw}AFGP#s)t256Upf~#Evx=o-|_2+2@luc*-?Ge6%>-yxWIt!dV zzOu4%j_~DCeXpHxYb{@xrqURs(zq zQ$J&q+BF|Bs2*4~vU76T7dX4p1}29v^&O2irgoTHU2K4nP@}EWEN#La0vE^hK)xoU z8mI^M%p8jg@^oY;Vz7I`hK1M;3OXVH6%PULxH)16r#5HaVEv|HmVDH zT!&jx^>B4LdfV<_579e%f2GcS`lC!W^nOkqEE}Ra_Nk`1;g&)DVQz?A`dT<~9}4SK z1^qr09#9oFE3Vfl0}__kVq-USh@mRKt+26XNRRyf$v#b|Wb{;#bHtSls+2js@@Hif zr{R2c5VtmFPshU)%5aO_=V!nyodL6S1{}OgX8>IxtYj<~<_qtC% z-4*WY33oqf$}1Q!*O(zidsD4{iAC_sq(+2cETfcahw`nIoM*M5%bY6p$sf%M^} zZ4AED7T@r|X(CV;W1k03@*G}rye-BF7(Wc0@Atq*Jn$cQ z;4GUdS>ZJ6r%&88QkJp5Flw-5U;p#5Xn*qg-rgZ?I5`}R^=nC%OJ%bKn>%P`@>Xxb zJf1Q~S+Q)DxP@o)CBw9O%|hN%`mt2{1<}pe_?OJo@n|+XR5UY|QDV=Q3OU0vGwFd; zanLLrHPROAGpwPsX&Cu~nNe$^(bbL2_=Lq^!B!tG94wgGQI<@WEOL}gPrQ&EOJ%a$ zV>E3ke#mC8naUZ%nViACN?r=))BQ$%oa~F<{(?!9%$#(FhtjF6(~0KCsT0j-aw#iQ z$j2vA`EkSPGCQ6`agqgN_#p=4d8Q{N_a<-aw&bC5lDEgaTua zP@O?gmh0)ETZan`al!UkOOM2l+A!yDRPdJsF8RXDO4WmZNx>gd>>Q9h4~c#3 zj`Na&f0T4&oUbc5?ktJ_L%~)4T?PM`!Vin18h%y&UIka}M-^PPQ&Mo%P8fzs@IfwQ zoQD(~XRgG*rQll?{Di4!uHfHQaNLQK|1Sl9RKXtEa_+$d5hvzjX0KoXyxDJ@|ij@plUT zI&tN?A;dPksQMww()u<6b{K}_d=R5A9NYr$My R_OOS3UBqv}m?Ccd{{Szbck}=N diff --git a/main.o b/main.o deleted file mode 100644 index 014bd998633ddf79fb3872f25e4da726aef8de6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4232 zcmbuBU2GIp6oAj}7N`pB@}r^%4vGd78C%k55GC7|ZD+&w2eyUyV9IoNXjgV;nwi-^ zNkmLRJFe9}n&^Y^K}}42@r4HiwWx&`~>E^x?!&7u)JLRqgl%G#Z<4NWS?!#^_CH6KhW*0c~Ol zHMNGg_8!kdi(S}Rzsv%=`XwrB6EBhqTgay$htf%+6rnf6bicTH>Sn!OAD{6qK2fhj zeFeZx@XmS{u>*DNTw-eM=4UoOg)^9ZqhEmEv|3E7?P=7!rJA>|QLDA4G_S+YSR4CV zkr$J^u=3fm$EEqe}i-7e`OeIfvWQ7i9SWz2r zG&lNf=8B(gt?SD8H?RLp347;Q%6__;E3!jBlsh8*SBtxA78k~C26KtYx!9y{`ezJ- zJNe!1dYz5gqta?G&!0aFgSt~HD2GdC(K-xWt=aCbOn1KmJ-vO|p6W2!?6FWOI?-Ti<&cZwK=NwU^&Aa-;w z#Ezt5>z6NUq%HFZa=J+N(k-(x^+vpX#nN~dH2^jvqPK?RC3LzlpBYOecE_0xn~b>O z63_tG>tWN0&^Ml97E#}6l|WBnl3-ciJ(B=TAVd;yPY9)TY3JQ730QU)B+sj*_*w0c z(RQQf5R}IegmE>3KNrEtz~DjMxo+p%oO8*ZO&4;gMpZyu^8*Kl0uG~6z$>KMJ2Q*uj| z2_se4fn3RPTMKS$xtt%dNfFx1hHkg%g+oKORW*yyW(<|gUAB&A)Q~^uvWmvGU66IG zis9O&LYF>5^N=x%e2Rv?zdkEpunoh63ayL=r~M)LD-vHN@$m?Lo^uhuID=_llLYxSA1`omf?emF z@?DLWh$oKwjzsub;}2mO=Rtkiza+#-SNPc_ar%Y`o|QQLeF=V4;txptEr~xU@pmP@ zPU0U){2_^dF7byYPXART6#sg>L_9x8oN6riFB0D%@mYz}UK09$N&HcXw@`smXkEEJ z+a)g7Cns?^uRRi%<2)d7IZi|3a-5dL=i3TW}{bqsx z&d1{Y68d7FJsr^B#Ov4;;2U`yN`Uhrqyt=h=RkEvE3Q6>t!w-3u;|%FSyx@-hzn{_ zcXdz)9S2lKZObPGt5PvcR4^^qQ1QoUtK;Ia$j3uwRUNUd5yN&zxuG#UaL~rnSj6>z zTLm3ZNtOm2rTO?XUKcUV%O{3xuhZU3FA%?zrXLiP1N>Kt&O)-~80cLic@i(;!9T9K zz`CSM5?r62FZukh_Rn&k!R4-T(1P=_P_DAj`5l)3hxhqfN4PTOPv41P{yULTPGUb| zmx;m?68l$hk-um=aYFQk4z;;pLHJ})cRzCayA0;v%k33zCmIpI7+csOpF#T(Zht^1 z@-}Es->tCvt)qgWh`P{_{*Hyc*gs)wlidZreiLu$n;T|N-!ZO2W{W~aLD>-~SYQbB Rtqrr+c>JTx%i=9){}0`y*8%_l diff --git a/mergeSort.o b/mergeSort.o deleted file mode 100644 index 84c8b38d95d81d7c03e6a07d9a40100b8de13939..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1376 zcmbtTPfHs?6n~qIf2(a2LBUeusVy`^A_~@n1VS`I^$-bok-AC81nO>NcNSF8dJ=N; zBluASFMb4%Uc6iCA@ow;+nq@!W4zP{Z{B;q_kQ!{?aclvep^jg7AUb`1-g+!0d^Bz zKOeby7=t(P=iP_Dl~U`z)H-Rm!pDo9Ygj83meZdq)zA}R`YT&t*-S2sqTK0xmSq=M z?sJUeK1tLR>HzB6W(Ba#6=60i$y98>Ixd5Cn6hTahK4WjfbS6}C7Gn9_%?N(D2xxT zV*$l42+fv+-~alh?Y@)KS+wCbqTM;A2BK?6)AV8#*)aGVjPRisaQYIxGLGS-cFt&a zDsj1A=UYu*uo`SAA0SOR6q=xC3Kkr>!l?oagdf|6@&rE=z}at|@D zDLBJx$^^ox{giRt3)z9+Jm9`K0_O95hw;YuJ>PM8)cRG+EVAj&%rBRhyLRT6G1cla zhXG;gJ*iw-Ifga)A2Cnw>3{iOkV|`JQFT%MDX)v_uk0cwm9N*G>Vf8)wMER)>*~3C zjL%R>($U&o%ztMGQ?#eazm$|EX_Ybg+nAtNoL2?X-pPZ`$an-Tom24@-mf=NZfQYz nhz*RQr9DhOVdmWtVR9h3hAg#A`# diff --git a/spiel b/spiel deleted file mode 100755 index 36d4062c66bce471abe1e69ac324c88905740a65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36488 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 diff --git a/sprite.o b/sprite.o deleted file mode 100644 index 83d073c4088c4495d0151ccfeb11655919f996e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3672 zcmbtX|7%-S6u)V@EzYgUW*vnMeM2YN*g`u8ZlaR3dF?HBZnn)Fx|zKuuWQ!krM$jq zr%ZpSlU|;a{skib>MvvShbgFCH~IyNL?}|lABxUdoIg|wT12Sl+%L)NTY@kT+}v|N z_k6qOo^v00SMO@C3j~Ow0C|B_RthC#achN-b2d&I$ab+w@gx3UtA4G;t^!18xOhh`ql7(+12owo2%g+`jQf8tO$hI z)Xm=>50t)L^Ge=90e7?stm$`F!w11cL|+1?)O7{T6lX!8)E~BHD4SWvV7UN*C`m(Q zkKBNQw<%bdk4G<0I&UOCTfeamlw?1T&m`E7Nw&0|kadz^w}IUUJCFlHW?{{ZttP_< zC%HEWXAR?|E)79ua5PbNm%0J!z8s=#Gi9ejZX&|kBT4pCl1=kK>DX=UUgo-RIzGb| zxi@x;Gi06JdT=l72d|R}h;2DbpB6XdY!cqDm@BU(&YT4=;#ToaA?i!Z)IGlJc1ADH zIm6dvaMP?Lf}3KcN+Q@48ipw2jXW1>6_NP>OYx2Q2vPSm; z!1x09hS^@HZVFwrDi>lUU8KN8_eK|6srzc#MR$aqim)kPGS05el}`s7YkY`A+r1p0aI{k| z3yj|>V4v2Izg7ePyaxVF4V;YdMvG-g(l*`{UDsQ9rC<+bNxGx!L~EieeWJa+NAFGd zCR)4nH0c~E3i2@CF~^ zRVCNwtzrynZ`ib*i=cy+%z<>jZRD{d|37J90En>Xi8uDegJR)C!EN_~vaODcXfx5B34y>dIT3967^wi{&dYvYfmQZ+AOD9wR$;aKC-Q&PIjN8Lk6$_EU)_H-->9-E{YPbB_@<#rzdqXZ-#tKO!SDH^ W^5f4RzD?Ei&&l|miYn*)`u_sI;|0F} diff --git a/textureatlas.o b/textureatlas.o deleted file mode 100644 index ddd110bbe7d610d4ffe601c5132a5f1e973b3a2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5136 zcmd5=TWnNC7@pm2X;GjnA{RkZ9*QNQOA93iMY6OxWk?!YDI1BTSq{6~c4aU1>^X7? zSk1DAlg(liV}f8}^+g_hAn~PwgvDYPqQ*X%n)uK}O$x0^iI@;HS^s~|%y#y0)_^94 zKbbQ#-+cdNZvSjMq;z(;T`nTTMYfaqo@X%^Au(Iz!74-|_<`%FgFR4SsUHXf!I zliHz(w(+nE>p4QrzMJN;f|-Jn#|WXm&g%)R3(6!`K>CS&&k!=M zoCWxtZ!pn6u6#ranIqtzaWgt^-Sk%xl6@ZsV13TauP5_pO(z!^fw8>20=WQC?a(mo#}=S?D&<(V3I8MG@G*P=67yFEWhr$%vl(PP~W1ta+?V8WBX8{ zrDto4#&FR%RWwQlX!=?`%z}mP93;)Xgj-P-=DJdtRgZF*Ly$78)m-o>hl%&W3bV$D zJ=Bic4#q$3<9&y1CiFk}8iyn>uAG7S;Z1(d*a`=Fgnm)VC6}yRV#KLgOU-??FcgC1 zl4v5-q~7^VFtg3F&}D3Pwh)eT3w;H@H_|ljUn=F1G`rz0%S3CgWx7M)XKw)gIQ zW{1QM4}z803(6c`gMz{?!p(P~4Jp-B=A;A!&rABmT-VUTf^w%C2s1U%@Gz}e_>!3| zS!K>Sk0=w=1?dDHq4{Sft<2S?m04F-nSD{Yb9@Z^QAlUYzD8TXoh+%i)5^3fePVh= z-RXW<=HcNRV|;}}hL%cdzW!(*DMNzcwEcI2IJ}ONg?>`;NPP@dEdLU=UId&^E+DuH#3HD`}7WBBLgk2-$}{j=w~3&SKW(8XmSvnq?VC0w4@XA-_#vOg)|DzP%<8mBw#F&)FVFltRbkU}KCZJ1%|5ofs zV)wrl#t>_kIM{rH$B*&JBJ@Sw27{t4^FDdN`R@TGq}t;@&-LqNqtF)XFW}dpf&T6K z*SY?PAoAL-kEhUS|3~q013AFHgy8<;uR)#_d c4#^-jw#Bt|3FZzb{gs%UKy<4reeL>x1NLekqW}N^ From 6b5ee407873df987be41f8dd4c0dd21f3c334b56 Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 2 Jan 2023 12:43:06 +0100 Subject: [PATCH 03/16] test --- animation.o | Bin 0 -> 2456 bytes animationHandler.o | Bin 0 -> 2240 bytes bucket.o | Bin 0 -> 1568 bytes game.o | Bin 0 -> 3560 bytes inputHandler.o | Bin 0 -> 6752 bytes isometricMap.o | Bin 0 -> 7976 bytes list.o | Bin 0 -> 5952 bytes main.o | Bin 0 -> 3968 bytes mergeSort.o | Bin 0 -> 1232 bytes nsdfgruio9ndf.test | 0 spiel | Bin 0 -> 35704 bytes sprite.o | Bin 0 -> 3504 bytes textureatlas.o | Bin 0 -> 4968 bytes 13 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 animation.o create mode 100644 animationHandler.o create mode 100644 bucket.o create mode 100644 game.o create mode 100644 inputHandler.o create mode 100644 isometricMap.o create mode 100644 list.o create mode 100644 main.o create mode 100644 mergeSort.o create mode 100644 nsdfgruio9ndf.test create mode 100755 spiel create mode 100644 sprite.o create mode 100644 textureatlas.o diff --git a/animation.o b/animation.o new file mode 100644 index 0000000000000000000000000000000000000000..d2ba2c3a37f0ac559dd716b7ed1a6c557946ecae GIT binary patch literal 2456 zcmc&#-%Aux6h5n_Q)z9|Ltx0#gBaxGS`bOZ)Z#jdg$N53NzU4o((bJ6&Voi+5Jk(r z_!#{Uy+&_JJ(&MQ_!4Z?OY|ZU*!k|<>)yS)k+RdSzil+zqzKeH1xmhQ9_ z!Q7KaR%a}?GL5?SIhqt~Fh^>U60y=;X*_>Ck@pnv6P|444d|okkEQY5WP_ zV!~)Vl^RV9X0qiVEGLpl`_6R92aeYZJ+Ga=e2J-qDIaB&vK`dGz>+n7$LWWLH1 zXJZU&^jVep;!NyMN&Jl*EzW`*FIdcb;bI}M=jn>_CxXS0@?I`i(7<%j%loOK?}fge zS@Mfvx>yK86TIrpKj6JYf_Dl1wHwK`Kj5!59CtzGZ^?b5hmI#?KHnGInLTl&r*Os7 zoPjHzo*KB~iR{u!KJ>C|!(wC?lvng~o*nwjA=!7m&?7rrDv>>3$me}#!ww3eZ}VLq zDurMoTHg=K_ENF1#H6i|EjsuMckY2&xr2W*2`&d!+HXfRbi|YBlTH$2=1s(X1IG@l zE`uPQWllVa4zWe8_&2e|e+V+b3S51+z##o55W!9J&oGXjX8L~XlU$4W!>qcfdi2*t zonP5e4k};In>05hgJ$j|<6W!<%``3R6S7Vj#h+Sd*+EaUeo5B9Qi;-<^|Oq(dVeol zyg$^cdiDNV&BiDTO<6X?ljty8Y{{%YC~=v#XFkgMxjiIuO#Y5B+=}X&+<)#b^}hjF CNWzQ& literal 0 HcmV?d00001 diff --git a/animationHandler.o b/animationHandler.o new file mode 100644 index 0000000000000000000000000000000000000000..cce9ddba50c3e823322e70e8af3c32406136e2e6 GIT binary patch literal 2240 zcmbtU-%Aux6h6CJ8mT+RB7zb76bU)G=0ir*)UrB3g-8n#MUFbU>h7%U&Voiik%Dbs z_R)IkxhEfcOXrd#RV8NhbeUOOke0T2EX&MOXgL}`p-#O==bI-jq57SqMqmc+H zMCd&2uM|sU9PsHvHK>EysS!K&J!4irnaiIOX61hUO@fVeIGC06j#BnN`7>mC;tuKaN_UPRG8iHDaAccWv{nFQ>*icf54$)QD+j zcO!OV9TCFYQ#6Cwn`_gtQ{oh*=vE4bsu5q_iIlsbn^l8TdTEhtf6J^IOCz471 zwBFyBEQ@9G!N7ptKiDg25!cK!nvVvIT+2|DXboHw4YwCrGD z8$+(=WIvTTu%sR~px1_Skg^pdV_eKchgl*PcLH>Kf{wEUul@s)rdPp4(h#IiGLJp~ zH9pC)*wgA_c4qN@f~9h-$k(g zx{Ob-&5vOHb8LibFuqk1EB;{CgYkHUVfUX6x&K4Hcy<3_xsmdv%>NY&MjH=osq(9M g>>0d!rl=;#G8R4r+uF&tu=sbfe)T_4TLj~O0W9!C^8f$< literal 0 HcmV?d00001 diff --git a/bucket.o b/bucket.o new file mode 100644 index 0000000000000000000000000000000000000000..69536e100e8615d5de974a4d0a785b2326ed5777 GIT binary patch literal 1568 zcmbtUO=}Zj5S~qwHfrjoQXyE8#e=BWm!x`-9%M1Zt|BFf!Cpi*>()y1Me;7BLiJD( zLN5Lce}XqtJw$K4dRqh`pdgY<5uwg(=1tONPdYG}nP;Av$=Op$ zS=|y+i^;(6n`y=eLp^P!5hTZ49O@gNRFJ`7pXft7#Hu{W_MPpN)M%1_9ARw~E8Bqp0jm#3fH6@yrw+%tGueYH)>cqq660yHYrC zJ8zvzDX-~PY$4sY1o70C zHi&Yo1;VLUt8NXkT3xyVce>n?wzJLgvzjLw&3eOa${i3v2Y2hqX49^^F{r72@|vzQxVvjyp#;bbQh{sr&jnS#?|}7bhsEE#ECF`jeGuUeU9g6 z)nK-2KJ}j#HDB3POe%kxw;lyXaPJ{DhkEQC!nnxw2Kv*Y_NTBiIz$cEH@N<$BC-wF zKSn(2ej5?@qgqw3?iV$iM!n_vZ3<9Mq0)`Q^(Podb4(1Lul_SslG~~f7SIddo{|l& LuZ)=^CtUv*D2B5& literal 0 HcmV?d00001 diff --git a/game.o b/game.o new file mode 100644 index 0000000000000000000000000000000000000000..55a903e12f1a030c6ccd363b9f28fd7dd388eea3 GIT binary patch literal 3560 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 UhP>97(?2ErH*GVeU$_2$08fHfQ~&?~ literal 0 HcmV?d00001 diff --git a/isometricMap.o b/isometricMap.o new file mode 100644 index 0000000000000000000000000000000000000000..3984640462a7b680bb9957f59fa89084f01b26eb GIT binary patch literal 7976 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 Y)H8q2kkK+%(%&ZkuWgbsSM%!s3#xMbaR2}S literal 0 HcmV?d00001 diff --git a/list.o b/list.o new file mode 100644 index 0000000000000000000000000000000000000000..b1c5857ce8732c0a3a61fdf928548a55231335f8 GIT binary patch literal 5952 zcmb_gUu+yl8K1M$)RZK94yI|-G`fd0q-lD#(*P~1s1nz$FUDrXkndxVq=AXpW1#j4^NUa%@r-knOcaTVaHL{#-}ydQK!>;-rXdeCfay_i8Cv#{5PwSbD@dDN_n0P=dFrxBeUZ{&ezJ1ih#o_B2$9V9c;T> z6bhtIAO(GHvi!^%GUJo19-*8D+k7e}UfoJi^zM@a1P^|tJFzIf36K7N%-s_~8*)ET z&s}BuACupw&4{mx7;}4VHe$sZ^N+rVO>V4*DQqVNeatuap)3~GIJ*ZQ_o`*uf0YMy*OkZO8fW+6?0&Vp zSa(Lo504QM}xOwM$Vt;06 z1xcBR(nN188+!+8M(4GY8A?NGI+W%*G>7XN3pNyauQ?43s!rNiu;H4U&}^3)`Y
  • ozo|il022zg&f2vTKCYqgOW~2K*wXiJMN6Na3jq% z1vy)zY0(Bp`D_>moOz26WfnzQ2hl6au?gp6|tS|=12T&lN0?w zi%A((%vo|WfEPc^mkqHWv%>ggb9PDY)Do@flJPPXNISRTbfeRpb@w8TS)-F9uG$FN zs$bI<(N>Cc{mv1(y*QIx-#~@IuI@#*!#(HQZC}3~-zydG&oo+RJld^#ymx4T*<)@e zKh-cdTt=ut%ng~V9Pgf5hrxrofwc~Ujk>`$E%XLWpc7wW zlF84-_6(mW7rb(;yF30&yzA-iG9PxI-M>HHb>K+}bN5&jTxr;szQeF}9w?x0ylH9!UED>l3-SfanzJQm~w^*D2{c+$V zSMl=ozwq^62ToGM%h&(X*Z&AO$!GCW`a(TE_e-i5P^e1Z`so%hb`W%n9>_m2Szo`{ zDm-x2niox-ZD9XcU85kNwdpTS;QV`SFu@va)%bi33EM^w{~g)DW^AYAD;{4{!a76v z2PFR@wGg!y2dR&^M==qS8hSgLf%g&BxJO&TK z{HSxxadV?=WTfO#ppkUu)seAOHpe6Oq&+PT`8?#N^7hee-ezBpnr zxHQS^XopByD{G@G+&f$}`* zq~o}w*#hw!7lC*KPRScC7Ht;>R5n~5mMzKaURtWBp%G?r2v1ArA|=mxuVUeo@?h)anF9;V{tlQQ!IX>RAO=0 z5redo&)anC#0!pR$LTla)BHA&Yloi4%rUm+!Y2JHu>{fcf({h&Rnu-X1!!lglSSu}kA;ZoVF{cjc< vCe}m3@H;Xwoa=}aw1>~&-otVR1|)9=7A!Di?ZjzjZ^{3=J?^Fc3fli0H_3^H literal 0 HcmV?d00001 diff --git a/main.o b/main.o new file mode 100644 index 0000000000000000000000000000000000000000..de28a902d0b67df7783a16dfac6764fc37146b24 GIT binary patch literal 3968 zcmbuBUu+ab9LMKcELHy8@khmgW=)V_lnVtyj4|ZOada-wQZ1DSL-2aHZBOoYo87%Y zO+-jR*jzAuF~KL}lf3vKzVIT{qA6%XNK6dzMJ0eGU?L$TO{1Q_@BC?p&23`zm+bD$ zXMTTYXJ+^P-0qz%i3HP!nfzRRwKEwd>45j*)56?erG#aO-!s{>JArW_S^^ zq?0gpWRP(YM9wEF;^B{4SvVP+K5*d);;IV4F7^@-t>Y8P<0oN74yMG^E}-7sL-p>P zU#NP&J@zZg4KIs=WwE)NraPI)BYFO-(7}rNu(ZI~-PZBDiE(NAM}ks2@!emIhUklT z#q0ZLu3Q=@_~oK?sO*&7L#(?q-_xDz>9^RP-o5!fJ$)AWX(C6Hc&=&yvCT31J7Rb~hQAfV561Ar zG5mN8|0srk62s5M@ULR{_c8pZ7=9y${~p6OFF8e`eG3cyR`bIn`vTVgJ zc-srbgF~KMb4qNxJydpfcm>+LL$cHDmh4SCSl)N5cHotZ-Gvd1vz${>L+DC>d)>aG zXWI^|B6i-PpzNSMI^Y((lI&4lQe|Jc6bv(%?(FS@GaWSV@3KdGJ=^!~5|f4Y4ZF2U zDO+)Un-ZqGsy|8d2*Fmx-v5&he+bq+1ZM(vm*y`4l7P3-rTG>>67Yp|X`TZl0mq)y zya-4F{y1Hl9|I(b@=1y3^3-S0)fj#&!Vv?4^#p-`d@yv}zX3_~Jgksi)<)|I64hU0 z@I^GP{bUWk*x=mYID@qQsKJ*SJTy4ok=Doe8iIVV&Nctk;L8mDxxtqk{HnoGtM-H6 z4G8?>8=(0OgX6bD^WO~ql)>*C{Aq)CV1h~D-<+SV1~=y?Z*a4&9)p{C>T?+W%{&JT zeKXIB!Oc8FgX7zv>;2f^&ludIHUz`CuA@V;RzBwVZPi~N;jL=E@LhpuKbGPfC7$EY zsywU+S6!Bg@LhT!?T=Q2!T?MAfhV8Cy5-rGLOQSy2P|DG1O=8J@O_pR)N>^%y49-f zkb>g|cA9=1HuwRZe5ya>)Y2oKJ7Rmms4}#N4-9&A#_I6@_i2#>ObN~&Q!=V^R?UkZ zQ`4urY&Es8HZpTWHhOVrk#O|`gtZAvNb?grHVaI;hjE{xdiXN$?*5LH#)QqxEkihWL6tQd7tpRghl4nnM?& zpIt^<45*u)cax#5?KIy<4ZNyo{o3Brit4HJ*Vv^7d`9huRsL^lMfHr@zeBv){H5>_ zAkp)J`NNcId%b>|#fIHw6@Nq}hBFXxqW1WXMb{1?_KMmNt0EH?=`x(5&FnKO|4}$I HBx?T;VPM1< literal 0 HcmV?d00001 diff --git a/mergeSort.o b/mergeSort.o new file mode 100644 index 0000000000000000000000000000000000000000..2289cc2f22f7cf61d4d2a6e4d3135aa813ce825f GIT binary patch literal 1232 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 literal 0 HcmV?d00001 diff --git a/textureatlas.o b/textureatlas.o new file mode 100644 index 0000000000000000000000000000000000000000..487913c3209e1ed0fff16d97ee817279a2605ebf GIT binary patch literal 4968 zcmd5y&FP&KL+v)WsJKPx$9yh=k#Al?P4r0rud-UQCAD!-zZ(HL2fs?m6A*wKbrL;Y;rQ z&iQ@+&!6wMN0e=wy&ew{zdTGReZ{<)xt zLTW3wX&#zoNPc@Hh@m zCaRMy0Su6T5JZzP`nZ#!(Znm?b6YOv=rp>d_Ql?Ex$G`ySk2|)MsD>1`jw{dkL#-s zsIaI*)Q)^gi^{pw{s1W|ETu$I`5N35l@Ux3_;;L_kQbG4WT5mjd!Hs`OnD#RGr?@8 zXH5Bs6bJesKGPjA_~^#AMndu@Q2;A+nig76PVFCH*H}=eph9E_#3S+=6e6JQhR(R4 zJPY*R?7l{Tn?rCvKpT4-`s+qp0z(^ZvB8}IQqxNneh@#MF zG66zu>YwcjQ%^Y_c9?5xdx#~uheR>#j|axW3#Fc7v8(QJT=cY__~egr`3|}xbb9zg zIGw(z%;0?}D(vFkcpJvhU2SDX>O}CpvHE9r9GP2GZsF~jYKB1rvzmrCnR+6x%+ziu zN{M=)ufSJn_Pb*#Gd@e1_T-i64a%*~#>GOM*%y0G$!o6Gy zI6g=amJnru|8;L?%N*~Epg~9*Ku;kK^gX_WT(KIwmzWCE*^4ruWtf1_p;kjfOA}MV z7_XrM&=q_M9q$Fl31T$}QiR%WvhR^w+)(qE3D%5BR1>bvLP?+13fLp?pv+C}0HD6m zW3>aef#V@e42abWd^frr#@OSFqAJ@Up*1DElrAZay~(xPOWrp7wiP2n0j20hQ3Qw?Zi zCYe@^q?U2?xCW`f%(pbl#dTv7G&a)Roil)UM|<~oC)8w$)D)BQn45Ji?I?n24wiw@Le3k3_%dA>Eer@kgcbKMxgw&_CuV@MU%IP#yd&376O5O9{unGQ$6agyT6D z__T!IFW~{+U@=eJYoY%f$I%Rj*iVpNlJpnBTz`f^+^Z_y~0_vJAOm-i(j;j;cI377R1-iOh@ zd=8IExO|>}l5qJvw}Cwp)`gFtFdqm!#^-_yTzn^vyY$6(f&_C1(}ubaxS>0|SB&&{ zN(~y&C`mA;8Y&6y%jHN=*PKaIOQ+)*kYzL@9)xdxfHgEe@5z|KtgdCD-5mrQ^c3&y zPUvbn&NKOMtPRZZ>hfi)I1BU9B5Ym~@oQc|mcR)2CR{(5g|S$F0ly3bjPJG|=k`NFk#n~_p2AxD@5f6F zw3oe|ZwuacVK4T-R%|rsyxnV!J+YR3mgjF& JES-Vd{x7L;AP)cl literal 0 HcmV?d00001 From f84124e768c619e90c504c879e97026704531cc2 Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 2 Jan 2023 12:44:00 +0100 Subject: [PATCH 04/16] test --- animation.o | Bin 2456 -> 0 bytes animationHandler.o | Bin 2240 -> 0 bytes bucket.o | Bin 1568 -> 0 bytes game.o | Bin 3560 -> 0 bytes inputHandler.o | Bin 6752 -> 0 bytes isometricMap.o | Bin 7976 -> 0 bytes list.o | Bin 5952 -> 0 bytes main.o | Bin 3968 -> 0 bytes mergeSort.o | Bin 1232 -> 0 bytes nsdfgruio9ndf.test | 0 spiel | Bin 35704 -> 0 bytes sprite.o | Bin 3504 -> 0 bytes textureatlas.o | Bin 4968 -> 0 bytes 13 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 animation.o delete mode 100644 animationHandler.o delete mode 100644 bucket.o delete mode 100644 game.o delete mode 100644 inputHandler.o delete mode 100644 isometricMap.o delete mode 100644 list.o delete mode 100644 main.o delete mode 100644 mergeSort.o delete mode 100644 nsdfgruio9ndf.test delete mode 100755 spiel delete mode 100644 sprite.o delete mode 100644 textureatlas.o diff --git a/animation.o b/animation.o deleted file mode 100644 index d2ba2c3a37f0ac559dd716b7ed1a6c557946ecae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2456 zcmc&#-%Aux6h5n_Q)z9|Ltx0#gBaxGS`bOZ)Z#jdg$N53NzU4o((bJ6&Voi+5Jk(r z_!#{Uy+&_JJ(&MQ_!4Z?OY|ZU*!k|<>)yS)k+RdSzil+zqzKeH1xmhQ9_ z!Q7KaR%a}?GL5?SIhqt~Fh^>U60y=;X*_>Ck@pnv6P|444d|okkEQY5WP_ zV!~)Vl^RV9X0qiVEGLpl`_6R92aeYZJ+Ga=e2J-qDIaB&vK`dGz>+n7$LWWLH1 zXJZU&^jVep;!NyMN&Jl*EzW`*FIdcb;bI}M=jn>_CxXS0@?I`i(7<%j%loOK?}fge zS@Mfvx>yK86TIrpKj6JYf_Dl1wHwK`Kj5!59CtzGZ^?b5hmI#?KHnGInLTl&r*Os7 zoPjHzo*KB~iR{u!KJ>C|!(wC?lvng~o*nwjA=!7m&?7rrDv>>3$me}#!ww3eZ}VLq zDurMoTHg=K_ENF1#H6i|EjsuMckY2&xr2W*2`&d!+HXfRbi|YBlTH$2=1s(X1IG@l zE`uPQWllVa4zWe8_&2e|e+V+b3S51+z##o55W!9J&oGXjX8L~XlU$4W!>qcfdi2*t zonP5e4k};In>05hgJ$j|<6W!<%``3R6S7Vj#h+Sd*+EaUeo5B9Qi;-<^|Oq(dVeol zyg$^cdiDNV&BiDTO<6X?ljty8Y{{%YC~=v#XFkgMxjiIuO#Y5B+=}X&+<)#b^}hjF CNWzQ& diff --git a/animationHandler.o b/animationHandler.o deleted file mode 100644 index cce9ddba50c3e823322e70e8af3c32406136e2e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2240 zcmbtU-%Aux6h6CJ8mT+RB7zb76bU)G=0ir*)UrB3g-8n#MUFbU>h7%U&Voiik%Dbs z_R)IkxhEfcOXrd#RV8NhbeUOOke0T2EX&MOXgL}`p-#O==bI-jq57SqMqmc+H zMCd&2uM|sU9PsHvHK>EysS!K&J!4irnaiIOX61hUO@fVeIGC06j#BnN`7>mC;tuKaN_UPRG8iHDaAccWv{nFQ>*icf54$)QD+j zcO!OV9TCFYQ#6Cwn`_gtQ{oh*=vE4bsu5q_iIlsbn^l8TdTEhtf6J^IOCz471 zwBFyBEQ@9G!N7ptKiDg25!cK!nvVvIT+2|DXboHw4YwCrGD z8$+(=WIvTTu%sR~px1_Skg^pdV_eKchgl*PcLH>Kf{wEUul@s)rdPp4(h#IiGLJp~ zH9pC)*wgA_c4qN@f~9h-$k(g zx{Ob-&5vOHb8LibFuqk1EB;{CgYkHUVfUX6x&K4Hcy<3_xsmdv%>NY&MjH=osq(9M g>>0d!rl=;#G8R4r+uF&tu=sbfe)T_4TLj~O0W9!C^8f$< diff --git a/bucket.o b/bucket.o deleted file mode 100644 index 69536e100e8615d5de974a4d0a785b2326ed5777..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1568 zcmbtUO=}Zj5S~qwHfrjoQXyE8#e=BWm!x`-9%M1Zt|BFf!Cpi*>()y1Me;7BLiJD( zLN5Lce}XqtJw$K4dRqh`pdgY<5uwg(=1tONPdYG}nP;Av$=Op$ zS=|y+i^;(6n`y=eLp^P!5hTZ49O@gNRFJ`7pXft7#Hu{W_MPpN)M%1_9ARw~E8Bqp0jm#3fH6@yrw+%tGueYH)>cqq660yHYrC zJ8zvzDX-~PY$4sY1o70C zHi&Yo1;VLUt8NXkT3xyVce>n?wzJLgvzjLw&3eOa${i3v2Y2hqX49^^F{r72@|vzQxVvjyp#;bbQh{sr&jnS#?|}7bhsEE#ECF`jeGuUeU9g6 z)nK-2KJ}j#HDB3POe%kxw;lyXaPJ{DhkEQC!nnxw2Kv*Y_NTBiIz$cEH@N<$BC-wF zKSn(2ej5?@qgqw3?iV$iM!n_vZ3<9Mq0)`Q^(Podb4(1Lul_SslG~~f7SIddo{|l& LuZ)=^CtUv*D2B5& diff --git a/game.o b/game.o deleted file mode 100644 index 55a903e12f1a030c6ccd363b9f28fd7dd388eea3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3560 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 UhP>97(?2ErH*GVeU$_2$08fHfQ~&?~ diff --git a/isometricMap.o b/isometricMap.o deleted file mode 100644 index 3984640462a7b680bb9957f59fa89084f01b26eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7976 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 Y)H8q2kkK+%(%&ZkuWgbsSM%!s3#xMbaR2}S diff --git a/list.o b/list.o deleted file mode 100644 index b1c5857ce8732c0a3a61fdf928548a55231335f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5952 zcmb_gUu+yl8K1M$)RZK94yI|-G`fd0q-lD#(*P~1s1nz$FUDrXkndxVq=AXpW1#j4^NUa%@r-knOcaTVaHL{#-}ydQK!>;-rXdeCfay_i8Cv#{5PwSbD@dDN_n0P=dFrxBeUZ{&ezJ1ih#o_B2$9V9c;T> z6bhtIAO(GHvi!^%GUJo19-*8D+k7e}UfoJi^zM@a1P^|tJFzIf36K7N%-s_~8*)ET z&s}BuACupw&4{mx7;}4VHe$sZ^N+rVO>V4*DQqVNeatuap)3~GIJ*ZQ_o`*uf0YMy*OkZO8fW+6?0&Vp zSa(Lo504QM}xOwM$Vt;06 z1xcBR(nN188+!+8M(4GY8A?NGI+W%*G>7XN3pNyauQ?43s!rNiu;H4U&}^3)`Y
  • ozo|il022zg&f2vTKCYqgOW~2K*wXiJMN6Na3jq% z1vy)zY0(Bp`D_>moOz26WfnzQ2hl6au?gp6|tS|=12T&lN0?w zi%A((%vo|WfEPc^mkqHWv%>ggb9PDY)Do@flJPPXNISRTbfeRpb@w8TS)-F9uG$FN zs$bI<(N>Cc{mv1(y*QIx-#~@IuI@#*!#(HQZC}3~-zydG&oo+RJld^#ymx4T*<)@e zKh-cdTt=ut%ng~V9Pgf5hrxrofwc~Ujk>`$E%XLWpc7wW zlF84-_6(mW7rb(;yF30&yzA-iG9PxI-M>HHb>K+}bN5&jTxr;szQeF}9w?x0ylH9!UED>l3-SfanzJQm~w^*D2{c+$V zSMl=ozwq^62ToGM%h&(X*Z&AO$!GCW`a(TE_e-i5P^e1Z`so%hb`W%n9>_m2Szo`{ zDm-x2niox-ZD9XcU85kNwdpTS;QV`SFu@va)%bi33EM^w{~g)DW^AYAD;{4{!a76v z2PFR@wGg!y2dR&^M==qS8hSgLf%g&BxJO&TK z{HSxxadV?=WTfO#ppkUu)seAOHpe6Oq&+PT`8?#N^7hee-ezBpnr zxHQS^XopByD{G@G+&f$}`* zq~o}w*#hw!7lC*KPRScC7Ht;>R5n~5mMzKaURtWBp%G?r2v1ArA|=mxuVUeo@?h)anF9;V{tlQQ!IX>RAO=0 z5redo&)anC#0!pR$LTla)BHA&Yloi4%rUm+!Y2JHu>{fcf({h&Rnu-X1!!lglSSu}kA;ZoVF{cjc< vCe}m3@H;Xwoa=}aw1>~&-otVR1|)9=7A!Di?ZjzjZ^{3=J?^Fc3fli0H_3^H diff --git a/main.o b/main.o deleted file mode 100644 index de28a902d0b67df7783a16dfac6764fc37146b24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3968 zcmbuBUu+ab9LMKcELHy8@khmgW=)V_lnVtyj4|ZOada-wQZ1DSL-2aHZBOoYo87%Y zO+-jR*jzAuF~KL}lf3vKzVIT{qA6%XNK6dzMJ0eGU?L$TO{1Q_@BC?p&23`zm+bD$ zXMTTYXJ+^P-0qz%i3HP!nfzRRwKEwd>45j*)56?erG#aO-!s{>JArW_S^^ zq?0gpWRP(YM9wEF;^B{4SvVP+K5*d);;IV4F7^@-t>Y8P<0oN74yMG^E}-7sL-p>P zU#NP&J@zZg4KIs=WwE)NraPI)BYFO-(7}rNu(ZI~-PZBDiE(NAM}ks2@!emIhUklT z#q0ZLu3Q=@_~oK?sO*&7L#(?q-_xDz>9^RP-o5!fJ$)AWX(C6Hc&=&yvCT31J7Rb~hQAfV561Ar zG5mN8|0srk62s5M@ULR{_c8pZ7=9y${~p6OFF8e`eG3cyR`bIn`vTVgJ zc-srbgF~KMb4qNxJydpfcm>+LL$cHDmh4SCSl)N5cHotZ-Gvd1vz${>L+DC>d)>aG zXWI^|B6i-PpzNSMI^Y((lI&4lQe|Jc6bv(%?(FS@GaWSV@3KdGJ=^!~5|f4Y4ZF2U zDO+)Un-ZqGsy|8d2*Fmx-v5&he+bq+1ZM(vm*y`4l7P3-rTG>>67Yp|X`TZl0mq)y zya-4F{y1Hl9|I(b@=1y3^3-S0)fj#&!Vv?4^#p-`d@yv}zX3_~Jgksi)<)|I64hU0 z@I^GP{bUWk*x=mYID@qQsKJ*SJTy4ok=Doe8iIVV&Nctk;L8mDxxtqk{HnoGtM-H6 z4G8?>8=(0OgX6bD^WO~ql)>*C{Aq)CV1h~D-<+SV1~=y?Z*a4&9)p{C>T?+W%{&JT zeKXIB!Oc8FgX7zv>;2f^&ludIHUz`CuA@V;RzBwVZPi~N;jL=E@LhpuKbGPfC7$EY zsywU+S6!Bg@LhT!?T=Q2!T?MAfhV8Cy5-rGLOQSy2P|DG1O=8J@O_pR)N>^%y49-f zkb>g|cA9=1HuwRZe5ya>)Y2oKJ7Rmms4}#N4-9&A#_I6@_i2#>ObN~&Q!=V^R?UkZ zQ`4urY&Es8HZpTWHhOVrk#O|`gtZAvNb?grHVaI;hjE{xdiXN$?*5LH#)QqxEkihWL6tQd7tpRghl4nnM?& zpIt^<45*u)cax#5?KIy<4ZNyo{o3Brit4HJ*Vv^7d`9huRsL^lMfHr@zeBv){H5>_ zAkp)J`NNcId%b>|#fIHw6@Nq}hBFXxqW1WXMb{1?_KMmNt0EH?=`x(5&FnKO|4}$I HBx?T;VPM1< diff --git a/mergeSort.o b/mergeSort.o deleted file mode 100644 index 2289cc2f22f7cf61d4d2a6e4d3135aa813ce825f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1232 zcmbVLOG*Pl5Uok#{})A2h)7(ipiSZj#DxSxjDm_N0XL$P*e0Np$fO6N;AbUdmm_!- z!3((b0vbeb)))O_0W)AY^40!uB;N*ecxp~cZU z(DFM4hyXki7eynC1`e#NJ+K;aE79N8-NLg>AWudZp(QsMzmH@GIybR_@;^Y=h{4-; zyK=P6%?Ge?MC1KgBzCx4=KD2Quo7&m7$8YC1m43pKcR)yFCAeQ(F-^56%`5I5Wr4s zVFN4H>%dAi$Kh4vsx`qGewO*VuuEq$FIPQw;nps=D=vY#{M=@|a&+q24iBgOJ4m3C zzEP*KLq_J|{bf$QI;JooPQ9P1?Ww@w%~yUIiz?Rp zZuCTp&E6c=y3pwTb==7$sgoF+ztuzJXiroBfE-~ZaN%m|53oZ2pG?>h1iSK}TU7iteP3I#wJqLStSAAI#7k|o)HlDDw$Y;9HPlAHHnsfR_xqj8+1bOc(!TwZ zlTY@Ud2TcF%*->lvpcs3=FZN~%d_+|!n(p@tb44)_!VJun+gE#HZ#*EL30PFgwb;z<`zEp7=HUm&u;eEIOtHZ^Bn z1*@Z*I9;9jtun6lk;X1XI{BY$of>+$?bxq=xb!Dof4jOpy#IgqolhR-n=<6#Lw;T5 zj5B-={>dZlaR)*YNBDZ^wFbgm&oNMNLKb2RaM|!o$CriwV-T|O&(48AGY9@)j&whp zBcJc*;D0BF{)ck#$8+%0{yzM>p9MfqC;3l`;eDjb-8L&;_%snf0My^Ne8C&9%+pXk)cCClo0QM_WSW;g-5c zUAWN-G*-`Q4z8$cthGv8z8t!BR(M6DH8&irUKCmxi8hC3H-{Ta8-leVi)^#Y7n($> zo82622ra5>2w7K$sv_a$3rZSmk-gFuk{ zISsdjuBmIR4zHlvg;mX=P@^5Ht6dfmNvr&1DlTshwNS6fx{iqQ>q4P?$`qm$v+L`c z>~M44ZQ;g9u->xkszWoQ%`M^Pbeh-HRU5ecf##VF76q$+2)* zI9gvV3Lvt&0EP(C3UlikLoHTiW!1`HWlde9l!lV}a22o^oT^k+Hw5b%t)^(C#i~KE zt(Kp03Pwn%S{7`E2pUG!&6QQlZmz5e*410k&>XxKpB&PrUND)6Duyq% z=FBafF|+c5;tQub!F1??;)~Gq@-hD8sZR+d#>DDynv#dnj9C3Q(g~4ggjIsRugC4D z?)f%`w~^MD6>e-@-58FBSF3pRlse43@~tI^^U?DwJ+J9HN#fV5`IE*kQTT#ZN!NHC z@4sE*IkxJtoR|RvkBm4^!ocgilQ?AHIbQ2$*ubBuk${`&nD88pe{^x@={E4HsDjpO z;5l#5PoIGo^Ib*gH}G=aAPEBoo@whRVc@lmNElFLfVh;0p}= zXanyx@M>@e zvj%>#fiE)fOAP$U27Z}=KgGZ|8Tii`_>~5JoPlpO@TVI1wFdt42ENn4pJw3K8+f0A z?=tYG8~BX|{tN@Z$-sZXz;8D2;|+Ybfj`T@_Zs-K4Sb)0pJ3pR1hZRUzvuHG*=>6Z z?D(jc!j@&XcSrJ5eRkW9f)|89>Y_UvEo)zDd>er0G>iPpNZFTsE0s!hiZ~tCzU1pp zoQ`T=a+?#UBi)yL+=7e!{?{MOD9{ZBFIB`0peaWB`rz6^z zyvm8w0qskcIB`0jeaR_KoDOGS@^mLohrTaa=)~!G_9gS2I33QubR6K6+9`E?wv zDT+m^=d@XtXitbws?Us%cg0V2#ZPj@$GGC7T=D<8IaB|KuJ~VE@poMD-@D?!am9b> ziofWJKj(@+?TY`{75}~~{*WtvpDW(sinqJst6lM^E8gIWhg|U+UGWN6yv!93xZ;<) z;upE%lU(ufuK200_(^7b%3n%juis?H-nQHJ43#emOzEETlHGCn%V>3}lTHNZftq5^ zX?GzC2iI}=$-vkhqfQ{0J{&m-uJ6sSNY{5vYQS?^EBRhf5d29JJ1%;g;GB=`*pR*L z{VVNl!z1jxo%ZV=N5(?ILrOtGYM@56Yb{Uz*n0W*LAIjjRoHEp-^QRFdnYp5j$i&Y zL=wq^sZ^pG&SvMR)rjZa2w5k6$|qNV$Up_;;H+5Y@?_};BPIM~Djbg#|K zdSc5&(gMSY@1h6W@xZVh>yZ>X=9ga3sun_5ksVu|=uDmkN@6nDYi!S&?T|^>@z#yt zuJJT(-|s2(dlM&Qq1xL%@@Wp3A&`i-_Ccs^c%J~H24 zZ+D#ZD8hDL-xa9=k+Ebqn89*8(XpPyQ80-laD5CylOp`(pPFzt3Ct(h-@pvu$qzSw z2s5qiiS>_9rK}Wu`iEBRg;+nGdkTR+Cj2z?v(O;Rx3-)4;@Bt5@U9)tv*TA4*s-JR z*wq*iOT2b$wm0z&*cIcUPbYR3ylLVjsFGTQm6(aQU_#9^7bBJ=cZx)$Jy{|<_9mIX zh#@4g1WMWxmCqjwJaBg)XNiL!rBYkVfk>PI>RsKQyS`2-DCiNU<*{&7=R?FUEriD6lnBljh5>D6EH_w zUh-6GGn!j!R_sq}drD%vXT=6!`;=7@+kqfjU8 zmY2Qtq4A;Z&5FG}E4DMy{}0&$2dkcxiL#N4)QtB1@23*`EfZ-`iF6`wiE8^iSyPcw ziT6n82n}6da>I>>x(+*DmWY>5Xn!fv^n}XX&RCz!-1b;s+7L0}Rgg>nSYZn$!2=D6%8gOh-@qQ^sP zzune7LEuh~2X@7F!YwYx3<^zIbic&oe}g)D8no@|i-kCIIs~I2L)42PT#3%*5OXQ9 zqVGA~>hJxr?dT_Y=qZ0in?093bw~^XY3_6 z4FflaEJ5F`>3gBKAEJ%jiJOqDPy$Q$KWS~=!zN}7DwEAY1&IXqYDa^XH?fZxsGSIV zdFkFJc9+EZQHTSmoX$g96LRuqAd&bvh#47&Dw*-&#Dkh#RtZD4a6Bc%ccPq)w$=uPwVN(@@7)YH~o&Nh%Z8S@IKc95yf>q8Yxk-nTpUKDM zNf0=H8v7!s>?M7eM6px1W1_$#iQFt0T%8Wix?;aZLE4*;)+b37bd-;Pc6MuhC;JJx*kavyTqiUnS}< zVjwOu(T6lW6QH?qJ0;36)fD~pn~b{69d?g7#!R7V+!ZBJx5@9V!y|1Y%4gd#Gi-6{Ou-@gw@_1U6fd~ zFH0jHnYdh|-Hn(7!{#2b70r+xFP|Wxf3n@SeXJTfHpihoa;l)Tbz?IR$h>J6s)fP=Cwy^kJp-rX?kX!jrrSM^dzlx zzOn6p|E;HVdkp^18vxqD&de1> zWr18#FfnrK6@`~mPY1L3W!;w7QX5kd%xazCt>A1#W75p)$h?-7$odnbbt^{xwadj= zzfKcAN4C2_Shrl8q{lyj6*kC8Bu#`kqHJl1VKxYB!iR0NJnfHRjlY$=iHG;f{<=b1 zxto@a1vVvbknv53$GH;n+;w>xgNYo4p_mPwEvGQBUdM_U+i+;d5zE?+ayVSw#B`TR z_qVPrME1ArVosNPm^BJhtQTGF`RTF~JvxZyz82Dox?y=CI%1ci#z7rypf%a8x@gVy zG&p%yDV|#Llxm)b$+JQ8ELJ=-$uk~>r>TS%lwXVn8nJ;0AC}aTNmRrpRKzA!#QmrU z;)l(Z*b>x%+7c)BWfG^p83L3Dd*}w_d{vY!MY0nUMG)0vHUtF>IkxU0Ze# zYAN6s?M+57pV_*QQkQF~$R|iG-jnxjt);HWB~`$FsHF~k~NXJX)6I8N|m$ad7fk>($l$&V3j;bg%-4T<*3 zJ)8rw#~{WwtYh)=kz|Q=a+F~xE>>qiussWe8kay)U87G*3^)vO5F&%@1a5|k$6}oc z%`JK!rjy$SV1}N=2MJ-fzMjBS;II@JyhtQ1vMPDw6;Ih!Z`d89e?vCdvCr-pS4a&% z6&gmg1)j>2LL5h@2cBBBr6(Y!xIKX_QbrfSm|Vs1Oo+AHkNHGQ*b|{Ga+!+ zbc&Jjz+;}D2GCp58&Q&0=x647btbv&AC3vAA?@@CJvKfr512rVCV z66=(HR7AO>Ggj=qVMnKkCUb9W_+qQ~#-fQ>#hzH%z}5nqcHmv`VIMgj*b9^F;if=> zfpfOgbHY6`hr{qWmgE@F90M7f0pt+2Gj<2L8^UctI;>amQPztMLe_u3Y}!u!tCWx$ z7OaxamTj~flY=8Cm*9T*8*dpD%Ypn=jfTtfmca{3Gy-0cI!AObhup#d26+tdnC0*H z+*Foe1elw+=v_?qQU0m)ve%~9(-a+ZF|b%<=N3E05TgU`&zPcI%k889%ZTPdnzLF! zQUUUl<{#Oa-hk7dKUT3j#(j>$z^=LQdCC~vf+!3O>6oC)l5z3Q(3t;qAq#R-MnM)! z(kg@Gj1~nDDnnID(=opTz;F=pmSHzQq7m?x?ZU^X%Y=?=X)|sXsND)k2@IPAi>k?o zmW}z}gO4(#QdoiF$ZeJGSl~b$Qzml_oRDi^*>F%~4%|X9MS zGR2Ydq2dEM#p&yGLYQ;x@qCR=DknSpvcW#!`Py^9u$+6C2}~zEcm7CW1{}=&xmDV6 z(cyFxRz3;|vuQJf5<6~{SED)OZqIsBK^4UWb><}mWdiXA?*rS=34iaiYplE=wG zZ~((z98DY*>a5XGp>ScAJWHCs-P7?qsT8~gIeBSM^8Qrw`bT1Ry0*)S7BG4bqDqCc zhoah#Dljt7WxQ!Ui7GHq%67B=6RHMJY->1}*S7i~mhgjc;9{UO%qORL!?EarSjAAR zZ0{_rpx|$5F{cQ_x(mnw_rU5~a&ibe1%_77Z(Du9T3On*ddONiGY7XaiEJU9C2+F| zL)1`)DJl{%?;y`42Z}kC_9W~9OkT~|+T4x}XIg#xQ`o-a3x0On=rgUk(|1Sz3dCBx z{DJ+vl`rql*w4dkuBW{fNK}}WxEN<#vG#`%OP{xm6A zIZ(G9m&biNrq}Iu$9?3I+d6tL=xVN3rOyzF!UeVWf=j3PD#A>KF#a?tpPmZ2GE*5E z)~OV>_kpTYWZ9VFE&;s)#-Ap~r>8=$%v8SNq;jrPmVR)#Q`@alBaA;yj!#dGT$!nj zLux(kj{%SFjs45J5Mm9|S{b#W?eF&5(&L^dRK(iXLR=f#$xd1{(_?3fu2Z5JB}t2N zk_{86u|kOU#bw6(V(pzum{o9i=^DcKLa6OIX5G5=*d9>^nxO4DW=Wt#0H`dgMF$q? zufevOYP#uclPt5Bg($jqJCn~UOL9z*d)hZJD|pg1lspkN7H?||_ldKqQ;-Z30Z=hX4{F3NWl>ys4Wtvh_r(F^x=qCM+C+x( z;sRVM4D4BVKBv(lUm(yVmkRTE){PPbHePJ65**{Xdq7OCb&YHiwt(kq-wbk3`zCw> zSsP5Yp66I?2Kf@fV18geJ* zG#RJ-BY&H1O~_To)*_^n*wruBf{?@9AN!f&KzZ2i@pGw&mIic>AA`FLXW6FW$+Xx+ z9L7{(Jl@#hRN+*p#l%r46&ql~*Z>>0qJII;NX7Gy|BL))QHXsn2o8uD2ig%=s)&n3 zV78NGSRZ`@&0u-KV3Q=ETFHw-I4HznyqJC!av_VAUp(3m z?OkN*!1hVJY<=dmE zrZQ{*;OILZg>`j45On9`ROTb*5*-GvcL@dNSbP+A#+Ze@KqmQnj%OdN}N3@L#v z*e4U^aiTjI#Wn;65bPB7VHZH;)j+(Oyj#{!A1nx>GhCF36Q*UzhNkF2qHG68fO%<( zGdu)(Nnxu~GV(wRgHPa9Qch76G_Cb06e?V}qdoL;LPqp+ykfq(4s2ZKEDoT=3rkFg6Fc$LjD`2!p^wgq10CK;Lxjw^5? zkHKMtJb@&NrWmKl2-{dE%Z-YmG}7-&hwZVN;Q)|B@@VUazZSVF>+_u7yL_f%PQTKE zbi8Q|GsdB1>Nnm@ypQ;?$r^bIr&L$&LL=l0E$|QAXQIW$=9Em?Ym(Dxuo!3%4nl0r z=rmbo7DJvpNh3%GHM|!F_*z{zI}rAM-~m)YUzTa^MQM4O5DRddNAC4hpPsIdT~heE zz^;9$sd=F6gH88&t`iz5GpYngY>@0~K9||p2cS=^dU-?w(rX0kCTqWh+MnvQ+BfST+$)UD{+}V`- zAtEe2%eMS%UA9`tHFGectywm#cZJM;d~0Cv);S1*Djn|BQ1HRt1l`FMGMW0kC zHb)ZoanC?ZLhkGm2{WZu2A_EgAHU#B(a!5*D>!qJ%o{tFtS!G?<)B zFnEP2;@_evK$%R6Je6XflXJbqYc#etPIp=zgSw0bN~ej_NvaryDU zZuEk#Ke5y}yxNV;xZTIBd0i<>PC+kM8k56lSv>)vHpzo>y!vy&nqqtgZlBP$dd~&X zGgPsdn|Rsocm?Mj>G!+NLbrkT{K!}N>G|g4U_;1?9EZ=m$T`U_AU;{epK!uBxC%*r zVNEkWr`%qTgeR@3!RMv7FZpEIM<{z4q$aGHj?eRMzmS<;gLh2#Ty*={*=4nlyP2}$ z6>vV2B`n>9Ja@l{m}*9YH>ox> zI72m{!Lza(9IAwu{wOIkxtZS&I1kOT8`)X)3bSIO23Gx4C%9%qW(OFYdzeXmQzd0& z2>#l!!K!WP@@MWvq0Flulv3^&rMG&q-JjU-GJBO+nPJ^0JP{Tc;v^m?L~QC<@pVt; zs5GSG9l|XQ+v+7~!Tf=6`2phyk?#Q5m>2f*9MN1+h_4ph*l%~>)r*dk{$50D3LUMl z(24Mc47{eMkN&&G(Lctgj>UK%ONhLg7AeamBHhwy7;5Dx$W;l~q9UQEF=Qj!hlGIg zb|Rdy*!~WUl5qgL5If;iiJkCe@Z|2|Y!2eL3L-7%udsg+ZoWCxeEy0clI_A;Y9kI^ zHr3xe30_HLsYa|Afb51g3y^J_kS!EU{RCiwOT_1T%i0-u0O$vcn;L6(2EL08mX%0f z@QSxF8A{H@#36nk39!(5yJO5Nc*{%9>qVl8*)Ne)(FJn1vcW=$0=I+mOVon~Y7$U! zkhh?pIX%V5>GA)+IeiETAC^r=tDJ6lF>O=!4VlxU zqxJui!O|^c98Gl?t*$zq?qJownbsy2_At^K-huBH!XfNLe{Xw^?^>T7osP!QWk2Ki zm1m`2i8k1=0y~E9-8_Sz3kfwhPC|X!-n3W1>_KRlk3F-j8mjA*h8k=Kh9>RwpJ4cu zHqq6wr_M~&dhX^I%?|O7x56};-VvT2BZTzyJpqmra9Ih0Sm{}bPoVIxJMh{Z&vGoRq3fcmD^KeRfY2d)B z7dUBvUvo}h`yCOytCPU&G4WZ?-L)v8xtKv2)Ye(-1(Z(@iOyOhV=Fad>&%Cut6kW6 zrl^<>doi|Th9Zqm~C58krm)Z;sP($69vhi z!M;*7O~VfBwP|$<4=(o(tBFcW3pTOoDs?b1N)lBtSSpbeMXqz~!@4&%g$lAml`f?> zbDvXKo$pqHV}L&GD~ImW{s+v(Rx9(6E-=h>T{>SnkEU@{woO!8+%ZlTRKehvq-M7T z+!ms&VIZbtm{){d-*A)7)Q9pU9_e;k*089nm{4b&57_d1ayWQV%P{#h7Kv5$GTh@I zi{3}`=q)LKQD!Bf$*mqv^lqcW5MOt)i})&%j1>C0md2|_UO%wcb=P30=~Rzpwd4I(p+OrTV&6P^PND!n!8ly3tZ~Egm|w*X2v@`a3CTw z6R$WR8#1!ellTrD$)OH`O;f%BIen|LHXM%?SwwAyS7B?A?c6+|Nx&-Nm3apEqW0om z$cf0I796a?1`WRAa*b52>m=jsN6d8P>yYwAR=h-0kk_|uU{s7735bn8^rb*iKZB!$ z=Qc_RYr-n96)KYn^5KVk`2)ITC8hJq0`n?-*8K8CrSs=4^jSCl44XChZ^i%p`2W_=Q>kOs zvk<>G8wt&94h172UqfBQR}-vnsah6l_La`^O&DK&jxQLksSPzpYeJ1a{IIaVH`Y}x zi};p?ZVom!MovHdbgc{}m>-SIubIIg9B!EvYKh>NZ~0rpzJ*Oe{J3y-qPyI!nTXqF znQ^t@RojdJ_q;6=QQ3lD8?K6ks!d8Hydu;r5Y%%`$%1*M^X6RQi!|SgUq1Fl!an@K zZewl8r+#JF7q0Ows;dwARxCp)eRVCqa5O^XQc}*x*M=49|vJ*BYwcoZpKLl;FxE?2N(d{2>1|wx2G5I z`e#$Ay?}RbNu@@Qu&f8L@i!6h+t}AE2YeU1?GeCha9naP;CdX!JOvneHI>>0I0NUu z2LSK*RVp7Ucl17;4Lq}R=@(B0QCS)0Q}qgScn6j zJ(Nl<1AGv0E#P?kV8KSfYXN%!?*U8zw&2GX3UE}!XRHKP-fau4yp`U(&y7C1pc6JF zejNUb9#5stBG0U&y##0Ce=7c$JO*3AhSu@k*~b@s$#dL_f>!IwQ!Y98!ZXhRR>>{rnHV$@YJHcUYMcdT%m(` zVEexf?RPW|HJyBp7;%hFqZ{;^?Wxp3kR5vdewhGJKK$+)ci;nzS z&}XB+U710@*r9I(J%oPvLWcfd2>m|bdO{ zK^ASDzF-^ZSDEyD+mWY_*a!NS4EmD}eJ<#Cof9qvy;DZDBE%GrBdI>px@!pF9SUa`c#uH#f6=306hkJF8{F#^zVWGwke@MB>3zMm(n|sPBoOKjfq7AAXz)Grozw9uHiBczV^m4bwRB^eZ}FDdAJE z@`qm)6Hk$Xc1z>D(1u0j-toFcwf>BHfZrVB|-X+?ahqW?q1bvcy!{}^!YJ#%TCtR}PaD@T@9 zuHs7+Y*MgQ!A=Fc6x^g>w}O2N4k$RJpoLeZ`FIudDL7d{zk=loE>W;a!Bz!373@-Q zlY-p}_9-}^;E;m)@+Yqtd@zqxaI%7Uy+S#(Z)#B zH)Trkg~gL6O^J%=lrJAtBe3P0v(OK_^;8OEa102t7rPztmLTZXj=xGO z7IR_*pHTQ4E|7S!enK$Uy<}X!`6O$`=kJA{43vnxp9BBT9Qa)K!i~cKbwYljrN>vD z(iz0-hygFofuAMtUW>o@&PS|Y0IyN_@I-;O#5xzjn{(({qxi?GfnCh;!GEv9KQvG3 z*&%`TsKRfWBoXXCe6}k56Sjn{ntOEkCA_h39_^(_bkr72JRPEu> zg%a_$!jDt;pqa^Nq^fiD+$uN7Y;6VYw{I)%SQ)vs=cEx;G%pX`h~I%~Hp{;Sl) zOze??c#ptqt~7jD>Cxk~raYd5|M?vFR|MW`eSDtOaEnqjn1lZ##lNmtGKzg81kb=k znEveqRbSdqPEq)KXGngr2ZG=w0xxmq=a+KeuLs_1jMrMGR_Q-qP29!4A&9r-(8I5a zF`q%@w{^SyKMMcg6;iX<%R%tz9D24Z{vW6bwAcp(|1Wd!{|R{Jzo=E}*Pq-sW`1r| z{YdOFf%s2_e^U94ZzzG|u)q-f%D;&{PSA=J{&LmcrYiok1ztrAFir9QWP(JBJxByg z75;~+9=9l&YZd;w$r2&<0}))FLw_sq?C;)Ir9gqN=iq-J2mS{+@Gl6w*E*o)dt&by zX}p|+|2H}CZ|A`8Rr;SECo}%M%KwK7|ENk=?1_W+5%Kw0ed=|B;^zf^+9zlf;b?*P zTJzNSQmu)&tuivDIE)(_gG=iwBf(k=h?YpSrlz>cN?+hv8EL4j;uW5}6tX&8Sz8}o z8mzCZ#tbk0@Ol1Ktx^# z8jREjTM!L4)-{MjJu{qEwKR(N&MDmxYOW0}3^y}eSvh+_Nm-yWFmD#`Hm$_%$dv(G zA?;ZUtjala=g%maTRDIB?1h0vm5WMd%ng8X*0u9W%1UQiH-~Or8V)vBmonQ{iOzwz zfK;AcrjezMEum)IO&V@AI3<#|q2j{ObXj>-sCf^n>k?L8%jwtGY4YaGjQd41?m5*r zkeYXyiW<{bcxLFyy#JJUu3jVF-&bdlEg6|CZw`M2r<#_$Jv2j)JiV=Gs>bQ9V-;~p zsnqA-GBs8-HYuGt9^ zQnH+Pug(rPuRv3?4!z(t>)p7SSG;EAjIB%APT%XALC{z;!7(f+dpbWq}!a3!h|y*=~3T-6TcrMzaxm>I0EnqO0cFRj5Gtn`w| zA=l&@{RnkHCf*ng%PYTJ-h9^19*%UWzOoOGb}&ZZ3wmtrn$VCJZf3 zjmZ9IN$qZTv>*f{(sr4bFPp}8a%s9QlR-$gL@IE?FDgS;qPVZQGQ`%L?e1ZtwZc}e z8;2cZ;gaAehJ==g>q6x8-Okh_uRLb?+122QaA&a?WTZz_T}ZX{5)KriOjdErtqqaj zQou;Fgv)dYJuTGSWED4tF(B18MvLK+P`t>k25M=vuD*IwUA01$%qX420amat3$`q? zimPvJL=qB4nk8j6p|Z2U{tj!$>OFPzPmF9F5s3#wg!_!COxr{(Z>lB$ocz zC{mRMQ}d#3y;p=L?8nO5?~+Q}P@j;Dlu0VgOTqnUdG=Ocy_vAsG+1 z4NQ5xpQxcPgPVI*na?$d{tbKAy8L>7UqhWfrg`FV=RXK6x8SvWzskRcLn_WZ(so*2 z@56H&j4WDSpC@Rj&kw*N9=H9uZsXp(me>378mi@~rSq@(G+YCD?)B@q-tX7YFH%k4 zN3HX(&{hWmw5gWY=MNfoD@L8Zme=L~j*_3D`1E;(hWh-2@|1DQe-Aj?MC*6v;c7mv zmP_D}kGuXi0By?ql$?g*of<6+sHgcFKH`#ZQj>lSHJ?_Y;~H*q$+s$b4gK1%N`aQs z@EMnU_gKlO;qT2i%s|p|N}aXUC9n7MG}Py4n%`}|7nQt|%_WLcLB0oOKJN6nzef9O zHoecQA>TbSA9wn{1JRUUTP3+Q+=BJA`RMkeaql2-JpNTTb@uZ+>m`SqU&l540BjyZ zUY{SVKTP@mfh^muPG9d^cPV*o82S%BI$dqY9|6bmJM!$%c)A)TT;j5yme=qo&`o)( zRmxdS66$mm)=6K-M?;vpbozST?^W_T9nJ5`j>U5Y;wEbb1+~1|o^q&K-h{gCI7|rm zRr-E9XFS}-8%3hvxNC1&S$o^u-s&Jh zO(tX~R}x-)^T9+Pj88^=SbWg2;r=AVlw=Q!F@`9bMNF7!qKh%s?>m3myG!?iUvlsH z&hLEx&iCiGZzqo(X$u61q5wHenmdIO65HD3bDElRTYKTt!9;58a zGG&!2WvPV>bvyP%K$f!PO7ApvlgqVGSPvsZT|MaP9of)>#agImp%yxOvliN(ysLz| zn?gZ0bMv>S1Jyfge(8HCyfL|&KvPB>r-{01p9e%KF)qfu)Es`sgpRn1?(O;fm{%>0DEq% zmI&>i=H4KjHH?$GGzb~OX9s1!Qa3=|mxGjTrtEakjfdHhaDx4mU~@cBI&n+8pZ-EP zot$UO+#8$a45_o(NB6?M_d2-&v8`n2K2a%Wlkk4sTzxHm_8fQ-)y3LE)K^xhdwj(m zh+JKCN}tQ%=2%q(H^ZvUM6ek&3{mRcJQr#gmiYin`ucnXse1A8i-ei1M z{|YNGxx~F;w(HbQp^HA{LhPiA6u1~%?_w);Uv0P;471Z=HsedixwXZ{t>MyPxHOgz z9%y6HL~4r{aIu@$C_5Rvu})9NL12|7ma4Mjx4$_A(TdEn{dNkb(&=a~JrX*i}<$T?cp$d}WjrmYPmw8);! zUd^avFPL^EYg$?{BXBF19(A-4bIh`}<$iBB_yz( z-}b(B@L)9d{9XxT5I`O9gyF$j9DON8+6b9OtQ{VtZn2QS(x3QJGRcYdwiOTn2yJBW3<$fbAyaIg zzl%7~8LyxA6X-%5w0NUv2l=Dk;t1}Brw>y*&%$~fe?Rx>MgZPT=fu$d}lU_#_HXJK3QM1)9Jwr5=S*;mHcIoJpRTg{F(>v^5BDL7zmdTJW5^z9trKs(D**V-%VWg z@u&}1eT;pIr0l4ECDHPwf@6%p>eyl(Rh(_+ji>`HL!!_G28oW8%Oq+S#U@=W6if@w ztfFH^;Tv{<_mtdUuqsjLypm}P)tW z+LE2Xp@`l<1anA!+BB)~IKaqCnCy`9&q`dDQ=)`??DMM*{QmdD0or_2{a(;To8F#) zE%`+HKaCp?srVK20x+l_Q-ECmmHHT;msI>}?Sn(bd*yogp9?P{c)#o*z&NM=_+wIE z6KajOKmLnwf;Rp7C#C*}4NbxL^|1?E)&I<6LjJs12-Y7VrLXGW$~UU4O8@W33*)x} l{rL6KroZ+8krE~aXjUwZw?BW|;iQ%Rl#JhLXbQ%!{~ugp4c!0$ diff --git a/textureatlas.o b/textureatlas.o deleted file mode 100644 index 487913c3209e1ed0fff16d97ee817279a2605ebf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4968 zcmd5y&FP&KL+v)WsJKPx$9yh=k#Al?P4r0rud-UQCAD!-zZ(HL2fs?m6A*wKbrL;Y;rQ z&iQ@+&!6wMN0e=wy&ew{zdTGReZ{<)xt zLTW3wX&#zoNPc@Hh@m zCaRMy0Su6T5JZzP`nZ#!(Znm?b6YOv=rp>d_Ql?Ex$G`ySk2|)MsD>1`jw{dkL#-s zsIaI*)Q)^gi^{pw{s1W|ETu$I`5N35l@Ux3_;;L_kQbG4WT5mjd!Hs`OnD#RGr?@8 zXH5Bs6bJesKGPjA_~^#AMndu@Q2;A+nig76PVFCH*H}=eph9E_#3S+=6e6JQhR(R4 zJPY*R?7l{Tn?rCvKpT4-`s+qp0z(^ZvB8}IQqxNneh@#MF zG66zu>YwcjQ%^Y_c9?5xdx#~uheR>#j|axW3#Fc7v8(QJT=cY__~egr`3|}xbb9zg zIGw(z%;0?}D(vFkcpJvhU2SDX>O}CpvHE9r9GP2GZsF~jYKB1rvzmrCnR+6x%+ziu zN{M=)ufSJn_Pb*#Gd@e1_T-i64a%*~#>GOM*%y0G$!o6Gy zI6g=amJnru|8;L?%N*~Epg~9*Ku;kK^gX_WT(KIwmzWCE*^4ruWtf1_p;kjfOA}MV z7_XrM&=q_M9q$Fl31T$}QiR%WvhR^w+)(qE3D%5BR1>bvLP?+13fLp?pv+C}0HD6m zW3>aef#V@e42abWd^frr#@OSFqAJ@Up*1DElrAZay~(xPOWrp7wiP2n0j20hQ3Qw?Zi zCYe@^q?U2?xCW`f%(pbl#dTv7G&a)Roil)UM|<~oC)8w$)D)BQn45Ji?I?n24wiw@Le3k3_%dA>Eer@kgcbKMxgw&_CuV@MU%IP#yd&376O5O9{unGQ$6agyT6D z__T!IFW~{+U@=eJYoY%f$I%Rj*iVpNlJpnBTz`f^+^Z_y~0_vJAOm-i(j;j;cI377R1-iOh@ zd=8IExO|>}l5qJvw}Cwp)`gFtFdqm!#^-_yTzn^vyY$6(f&_C1(}ubaxS>0|SB&&{ zN(~y&C`mA;8Y&6y%jHN=*PKaIOQ+)*kYzL@9)xdxfHgEe@5z|KtgdCD-5mrQ^c3&y zPUvbn&NKOMtPRZZ>hfi)I1BU9B5Ym~@oQc|mcR)2CR{(5g|S$F0ly3bjPJG|=k`NFk#n~_p2AxD@5f6F zw3oe|ZwuacVK4T-R%|rsyxnV!J+YR3mgjF& JES-Vd{x7L;AP)cl From 732efea2d3582fbfc22fd4f09b45d5c16fbbee13 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 3 Jan 2023 00:04:32 +0100 Subject: [PATCH 05/16] segfault fixed --- .vscode/settings.json | 3 +- Makefile | 5 ++- Ui/buttons.c | 66 ++++++++++++++++++++++++++++++++++++++ Ui/buttons.h | 26 +++++++++++++++ Ui/screenIDs.h | 4 +-- assets/button.png | Bin 0 -> 1275 bytes assets/button_hovered.png | Bin 0 -> 8496 bytes assets/button_pressed.png | Bin 0 -> 1267 bytes main.c | 36 ++++++++++++++++++++- 9 files changed, 135 insertions(+), 5 deletions(-) create mode 100644 Ui/buttons.c create mode 100644 Ui/buttons.h create mode 100644 assets/button.png create mode 100644 assets/button_hovered.png create mode 100644 assets/button_pressed.png diff --git a/.vscode/settings.json b/.vscode/settings.json index 9e6e03e..2644e13 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,6 +9,7 @@ "textureids.h": "c", "tile.h": "c", "raylib.h": "c", - "game.h": "c" + "game.h": "c", + "buttons.h": "c" } } \ No newline at end of file diff --git a/Makefile b/Makefile index 5daf646..3d670b6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CC = gcc FLAGS = -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 -OBJS = main.o sprite.o inputHandler.o isometricMap.o list.o game.o textureatlas.o animation.o animationHandler.o bucket.o mergeSort.o +OBJS = main.o sprite.o inputHandler.o isometricMap.o list.o game.o textureatlas.o animation.o animationHandler.o bucket.o mergeSort.o buttons.o spiel: $(OBJS) $(CC) -o spiel $(OBJS) $(FLAGS) @@ -38,5 +38,8 @@ bucket.o: DepthSorting/bucket.c mergeSort.o: DepthSorting/mergeSort.c $(CC) -c DepthSorting/mergeSort.c $(FLAGS) +buttons.o: Ui/buttons.c + $(CC) -c Ui/buttons.c $(FLAGS) + clean: rm *.o spiel diff --git a/Ui/buttons.c b/Ui/buttons.c new file mode 100644 index 0000000..6d92156 --- /dev/null +++ b/Ui/buttons.c @@ -0,0 +1,66 @@ +#include "buttons.h" +#include "../game.h" +#include "screenIDs.h" +#include "stdio.h" +#include "raylib.h" + +void executeButton(Button *button, Game *game){ + button->state = 0; + switch(button->id){ + case 0: // continue game + if(game->screen == SCREEN_PAUSE){ + game->screen = SCREEN_GAME; + } + break; + } +} + +void drawButton(Button * button){ + printf("%d\n", button->state); + updateButtonState(button); + printf("DRAW JETZT\n"); + DrawTexture(*button->textures[button->state], button->position.x, button->position.y, WHITE); + printf("funktioniert\n"); +} + +int updateButtonState(Button * button){ + if(GetMouseX() > button->position.x && + GetMouseX() < button->position.x + button->textures[button->state]->width && + GetMouseY() > button->position.y && + GetMouseY() < button->position.y + button->textures[button->state]->height + ){ + if(IsMouseButtonPressed(MOUSE_BUTTON_LEFT)){ + button->state = 2; + return 2; + } + button->state = 1; + return 1; + } + button->state = 0; + return 0; +} + +int isButtonHovered(Button * button){ + if(GetMouseX() > button->position.x && + GetMouseX() < button->position.x + button->textures[0]->width && + GetMouseY() > button->position.y && + GetMouseY() < button->position.y + button->textures[0]->height + ){ + return button->state = 1; + } + return button->state = 0; +} + +int isButtonPressed(Button * button){ + if(GetMouseX() > button->position.x && + GetMouseX() < button->position.x + button->textures[0]->width && + GetMouseY() > button->position.y && + GetMouseY() < button->position.y + button->textures[0]->height + ){ + if(IsMouseButtonPressed(MOUSE_LEFT_BUTTON)){ + return button->state = 2; + } + } + return button->state = 0; +} + diff --git a/Ui/buttons.h b/Ui/buttons.h new file mode 100644 index 0000000..15d2a75 --- /dev/null +++ b/Ui/buttons.h @@ -0,0 +1,26 @@ +#ifndef BUTTONS_H_ +#define BUTTONS_H_ + +#include "raylib.h" +#include "../game.h" + +typedef struct Button{ + Texture2D *textures[3]; // [0]: Normal [1]: Hovered [2]: Pressed + Vector2 position; + //char text[20]; + int state; // 0: default 1: hovered 2: pressed + int id; +} Button; + +// executes the logic of one button of certain id - huge switch? +void executeButton(Button *button, Game * game); + +int updateButtonState(Button * button); + +void drawButton(Button * button); + +int isButtonPressed(Button * button); + +int isButtonHovered(Button * button); + +#endif \ No newline at end of file diff --git a/Ui/screenIDs.h b/Ui/screenIDs.h index bf95efd..e55f992 100644 --- a/Ui/screenIDs.h +++ b/Ui/screenIDs.h @@ -1,5 +1,5 @@ -#ifndef BUTTONIDS_H_ -#define BUTTONIDS_H_ +#ifndef SCREENIDS_H_ +#define SCREENIDS_H_ #define SCREEN_EXIT 0 #define SCREEN_MAINMENU 1 diff --git a/assets/button.png b/assets/button.png new file mode 100644 index 0000000000000000000000000000000000000000..0ea26fa9842387c50fb44764cae5590ee8eb7ce6 GIT binary patch literal 1275 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58aUX1p(_C)#=(4iIVe4|bi{<)qzVk+Q;1%*9n^E0^mEfvnarS)aIH?7mWyM8w?>Zhi3J zeA3l}M+HcwZkJn&->H5aL&F>XG)_Edn5>YPf&1j6jhy)sO+}eud7vL?(y0`&gf5#n0w)s3ar^IS{c%OLQ_}%!|G97_^tX0?c>@+=J z_={mlX4pyT2M+`!bOXNaI=_4O?dRX}{fq1DSs9C}uWG4o1V#&6lDE4HLl!8Wv<_aG z45T;3yJV8r zT@HS}=Y7(qVAt{|qPbT0tr){IZU3b@@w1*@z-jwrnxk;d3Ed{OKNF&vd_O2|=a}`u zIgiuiVf!7Sj6?i8RWGb+tB?IEEW32|)=8=czn3#7JD$9FU!-CA|BYw1zpCCZ5JD7BDcdGH5V3Fv58Oed`$?ubBxFKO)lbQ9k_~3s8Z=GKQZ27S(DD3TuJp7qU5X zJNzgVTg%`O#aQv{u}_;=!-vN?V6q2Hu9=sAd3Ix*`IjTofh_Y+%{y~uTK0L{_P`&8 zyfM{#pPnicta)K=d|Fc6=JBzXc}p@EOh2RJe{aTx#XR%Qo+*0T%UGL!EWA;11{2hI z3|tHWXf6f{Ni1df^F7Xh5xeY*i!bxpK4lrKm^}08JL!t=&!;dt)z_y@+nw(qsqp1* zN?PSFwST+YlpH>+KYQlR?OvNo+ZA56-u5VQLUv z@Jxh3=Jc=SJ6$;s9N_<@+ubeHV7UBG=IeaDDGWSf|MIyU1P?eIydTZr#lXh-{~l8S uOMuOfbdd(5hNgx47cop>6yf}vZ@*LX*1glmnBD;M0E4HipUXO@geCy=fC-KO literal 0 HcmV?d00001 diff --git a/assets/button_hovered.png b/assets/button_hovered.png new file mode 100644 index 0000000000000000000000000000000000000000..32a0d04a9c904957ffc3be05a1cc1738d9860b34 GIT binary patch literal 8496 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 literal 0 HcmV?d00001 diff --git a/assets/button_pressed.png b/assets/button_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..7715efa6515a13e764beaf4a82dc5db487091ea4 GIT binary patch literal 1267 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58aUX1p(_C)#=(4iIVe4|bi{<)qzVk+Q;1%*9n^E0^mEfvnarS)aIH?7mWyM8w?>Zhi3J zeA3l}M+HcwZkJn&->H5aL&F>XG)_Edn5>YPf&1j6jhy)sO+}eud7vL?(y0`&gf5#n0w)s3ar^IS{c%OLQ_}%!|G97_^tX0?c>@+=J z_={mlX4pyT2M+`!bOXNaI=_4O?dRX}{fq1DSs9C}uWG4o1V#&6lDE4HLl!8Wv<_aG z45T;xbr0u@ooF`ebu>FqFizfb^ zt`}P6i@X+o<(%;Ws`s@@5o{n>X`J-v8e zq+$90>|lrW`@U;4w*0T)j9@JW|NMGJ zHHHmL3=_2vc)kA<&1~>*HUk4Ig9d{GBLf#h07C;4oVP$`J>%mwGeOcvL>fNIr=Md1 zs#917G{vG?jX_~8gU#PUHfL^!ABAFT862X37C!cA6KnYJI0sDjfXOv|<=H@?|9H5EnGEeS!1Np=J?8Fr+%Xy zX2!o~nzNmmE4iM@*?<-1JQ0QkC@yyJJX|kv!k^h`?wL35_ccb>`$;N%d4K-Qzjx9B zY#e`WX5L)Cuk-%8g&YEZij6m)EmIDU<6kxZVfy;-7uK`RSL|5E$Wp&&H>-iLYQu;A ztv?eKzxU+XC7iIGJ)2*u==_rKM#YGmOa`nEblUtGycp6ia4{?qYtUp!KMxL#bqs45 zEsE7Z!B@zdzy7qNufZ{~QQP6G>46{p zrVoC8ywAcA#-LEgx?&fb#Q%+KGSdHj84{Rpu6a9KY1z{lnP`&k2)vb4yneu(<9 zmLY-l$4##F?9AKe|JyItAk?t+aQ$|MDGY0*|Fv^Da2}ZTuzm-F2;&;jKhCTRSQ6%b xkk?{xWdP>MB1R476_URmvM%6R;P+zxZ>Gg_J|Azb{M!jiq@J#RF6*2UngEbV2etqJ literal 0 HcmV?d00001 diff --git a/main.c b/main.c index 389fe9b..3de0b84 100644 --- a/main.c +++ b/main.c @@ -10,10 +10,11 @@ #include "DepthSorting/bucket.h" #include "DepthSorting/mergeSort.h" #include "Ui/screenIDs.h" +#include "Ui/buttons.h" int main(){ - InitWindow(800, 450, "basic window"); + InitWindow(1600, 900, "basic window"); Game *game = GameInit(); @@ -64,6 +65,19 @@ int main(){ int uitest(Game * game){ + Texture2D button = LoadTexture("assets/button.png"); + Texture2D buttonHovered = LoadTexture("assets/button_hovered.png"); + Texture2D buttonPressed = LoadTexture("assets/button_pressed.png"); + + Button continuebutton; + continuebutton.id = 0; + continuebutton.position = (Vector2){GetScreenWidth()/2, GetScreenHeight()/2}; + continuebutton.state = 0; + + continuebutton.textures[0] = &button; + continuebutton.textures[1] = &buttonHovered; + continuebutton.textures[2] = &buttonPressed; + while(!WindowShouldClose()){ // Moving cursor Sprite to Mouse Pos @@ -111,9 +125,25 @@ int uitest(Game * game){ break; case SCREEN_PAUSE: ClearBackground(RAYWHITE); + BeginDrawing(); + BeginMode2D(*(game->camera)); + IsometricMapDraw(game); + EndMode2D(); + + DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), (Color){0, 0, 0, 150}); + int textWidthHalf = MeasureText("Paused", 28) / 2; + DrawText("Paused", GetScreenWidth()/2 - textWidthHalf, GetScreenHeight()/2 - 14, 28, WHITE); + + printf("Vorher \n"); + drawButton(&continuebutton); + printf("Nachher \n"); + if(continuebutton.state == 2){ + executeButton(&continuebutton, game); + } + DrawSpriteToScreen(game->cursorSprite); DrawFPS(GetScreenWidth() - 95, 10); @@ -123,6 +153,10 @@ int uitest(Game * game){ game->screen = SCREEN_GAME; } break; + default: + printf("\n\n\n\n\n\n Wir haben ein problematisches Problem! Die Screen-ID [%d] ist nicht definiert. Hmmpf... früher bescheid wisse!\n\n\n\n\n\n", game->screen); + return 1; + break; } From 94a3b03a1a4bb8ce10a26bd3b9e49938c8a59a84 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 3 Jan 2023 16:58:14 +0100 Subject: [PATCH 06/16] Ui Container added, Sprite richtung bug komisch hmmmmm --- .vscode/settings.json | 9 +++-- Makefile | 9 +++-- README.md | 20 ---------- Ui/{buttons.c => button.c} | 51 +++++++++++++++++--------- Ui/button.h | 31 ++++++++++++++++ Ui/buttons.h | 26 ------------- Ui/uiContainer.c | 42 +++++++++++++++++++++ Ui/uiContainer.h | 21 +++++++++++ main.c | 75 ++++++-------------------------------- 9 files changed, 152 insertions(+), 132 deletions(-) rename Ui/{buttons.c => button.c} (53%) create mode 100644 Ui/button.h delete mode 100644 Ui/buttons.h create mode 100644 Ui/uiContainer.c create mode 100644 Ui/uiContainer.h diff --git a/.vscode/settings.json b/.vscode/settings.json index 2644e13..f0c1e26 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,4 @@ { - "C_Cpp.errorSquiggles": "Enabled", "files.associations": { "isometricrenderer.h": "c", "sprite.h": "c", @@ -10,6 +9,10 @@ "tile.h": "c", "raylib.h": "c", "game.h": "c", - "buttons.h": "c" - } + "buttons.h": "c", + "string.h": "c", + "uicontainer.h": "c", + "button.h": "c" + }, + "C_Cpp.errorSquiggles": "disabled" } \ No newline at end of file diff --git a/Makefile b/Makefile index 3d670b6..da13a5c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CC = gcc FLAGS = -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 -OBJS = main.o sprite.o inputHandler.o isometricMap.o list.o game.o textureatlas.o animation.o animationHandler.o bucket.o mergeSort.o buttons.o +OBJS = main.o sprite.o inputHandler.o isometricMap.o list.o game.o textureatlas.o animation.o animationHandler.o bucket.o mergeSort.o button.o uiContainer.o spiel: $(OBJS) $(CC) -o spiel $(OBJS) $(FLAGS) @@ -38,8 +38,11 @@ bucket.o: DepthSorting/bucket.c mergeSort.o: DepthSorting/mergeSort.c $(CC) -c DepthSorting/mergeSort.c $(FLAGS) -buttons.o: Ui/buttons.c - $(CC) -c Ui/buttons.c $(FLAGS) +button.o: Ui/button.c + $(CC) -c Ui/button.c $(FLAGS) + +uiContainer.o: Ui/uiContainer.c + $(CC) -c Ui/uiContainer.c $(FLAGS) clean: rm *.o spiel diff --git a/README.md b/README.md index 69f32e3..b4b9834 100644 --- a/README.md +++ b/README.md @@ -22,29 +22,9 @@ Fantasy Welt oder Realistisch? + LinkedList erweitern + Sprites Animationen etc improven + Die Inputs sollten den Kamera Zoom beachten, aktuell geht noch alles kaputt wenn man den zoom umstellt -+ Funktion, um die ganzen Sprites nach ihrer y-Koordinaten sortiert zu drawen -+ Drawable Container machen, die sortiert werden können, dort kommen alle Tiles und Sprites rein, damit sie dann sortiert werden können + Maps in eigenen Dateien speichern + Parser für Map-Dateien + MapEditor -* Rendering Reihenfolge: layer 0, Sprites auf layer 0, layer 1, Sprites auf layer 1; Theoretisch müssen die einzelnen Layer Reihenweise gedrawed werden mit den Sprites zwischendrin + IsometricMap struct erstellen, das den IsometricMap(+Layer) Array speichert ? -+ Beim rendern müssen die map tiles und die sprites nach ihrer depth (d = x + y + ~0.05*z) sortiert werden, dafür sollten wir ein bucket sorting system implementieren. Buckets sollten erstmal nur tiles und sprites unterstützen. -+ Wir können auch die Sprites in der Liste nach d sortieren, dann geht das gut mit "nur in der Kamera sichtbare Sprites rendern". d ist nicht optimal, vielleicht auch einfach über die ganze Liste gehen und nur die sprites mit $ x y \subset camBounds $ in das Bucket sorting system einfügen. Buckets können auch mit MergeSort oder so sortiert werden -[Vererbung in C, drawable superStruct?](https://de.wikibooks.org/wiki/C%2B%2B-Programmierung:_Vererbung) - -+ Mit der Map geht das schon recht einfach, weil wir wissen welche tiles in der Kamera sind. d -+ TODO: Das rendern der IsometricMap wird bei größeren Maps sehr ineffizient; -+ Add offset x and y to each tile to be calculated ONCE, not every frame -+ Alle gehardcodeten screen bounds (450 225 800 400) durch GetScreenWidth() GetScreenHeight() ersetzen -+ Kameraposition abhängiges drawen auch für Sprites implementieren - -### WiP - -+ Dokumentation aufholen - -### Done - -+ Movement speed der Sprites an delta time orientieren diff --git a/Ui/buttons.c b/Ui/button.c similarity index 53% rename from Ui/buttons.c rename to Ui/button.c index 6d92156..4e77dac 100644 --- a/Ui/buttons.c +++ b/Ui/button.c @@ -1,10 +1,29 @@ -#include "buttons.h" +#include "button.h" #include "../game.h" #include "screenIDs.h" #include "stdio.h" +#include "stdlib.h" #include "raylib.h" +#include "string.h" -void executeButton(Button *button, Game *game){ +Button * InitButton(Texture2D textures[3], Vector2 *position, char *text, int textLEN, int id){ + Button *button = malloc(sizeof(Button)); + + button->textures[0] = textures[0]; + button->textures[1] = textures[1]; + button->textures[2] = textures[2]; + + button->position = (Vector2){position->x, position->y}; + button->centerPosition = (Vector2){position->x + textures[0].width/2, position->y + textures[0].height/2}; + + strncpy(button->text, text, textLEN); + button->state = 0; + button->id = id; + + return button; +} + +void ButtonExecuteButton(Button *button, Game *game){ button->state = 0; switch(button->id){ case 0: // continue game @@ -15,19 +34,17 @@ void executeButton(Button *button, Game *game){ } } -void drawButton(Button * button){ - printf("%d\n", button->state); - updateButtonState(button); - printf("DRAW JETZT\n"); - DrawTexture(*button->textures[button->state], button->position.x, button->position.y, WHITE); - printf("funktioniert\n"); +void ButtonDrawButton(Button * button){ + ButtonUpdateButtonState(button); + DrawTexture(button->textures[button->state], button->position.x, button->position.y, WHITE); + DrawText(button->text, button->centerPosition.x - MeasureText(button->text, BUTTON_FONT_SIZE)/2, button->centerPosition.y - BUTTON_FONT_SIZE/2, BUTTON_FONT_SIZE, BLACK); } -int updateButtonState(Button * button){ +int ButtonUpdateButtonState(Button * button){ if(GetMouseX() > button->position.x && - GetMouseX() < button->position.x + button->textures[button->state]->width && + GetMouseX() < button->position.x + button->textures[button->state].width && GetMouseY() > button->position.y && - GetMouseY() < button->position.y + button->textures[button->state]->height + GetMouseY() < button->position.y + button->textures[button->state].height ){ if(IsMouseButtonPressed(MOUSE_BUTTON_LEFT)){ button->state = 2; @@ -40,22 +57,22 @@ int updateButtonState(Button * button){ return 0; } -int isButtonHovered(Button * button){ +int ButtonIsButtonHovered(Button * button){ if(GetMouseX() > button->position.x && - GetMouseX() < button->position.x + button->textures[0]->width && + GetMouseX() < button->position.x + button->textures[0].width && GetMouseY() > button->position.y && - GetMouseY() < button->position.y + button->textures[0]->height + GetMouseY() < button->position.y + button->textures[0].height ){ return button->state = 1; } return button->state = 0; } -int isButtonPressed(Button * button){ +int ButtonIsButtonPressed(Button * button){ if(GetMouseX() > button->position.x && - GetMouseX() < button->position.x + button->textures[0]->width && + GetMouseX() < button->position.x + button->textures[0].width && GetMouseY() > button->position.y && - GetMouseY() < button->position.y + button->textures[0]->height + GetMouseY() < button->position.y + button->textures[0].height ){ if(IsMouseButtonPressed(MOUSE_LEFT_BUTTON)){ return button->state = 2; diff --git a/Ui/button.h b/Ui/button.h new file mode 100644 index 0000000..77673d9 --- /dev/null +++ b/Ui/button.h @@ -0,0 +1,31 @@ +#ifndef BUTTONS_H_ +#define BUTTONS_H_ + +#include "raylib.h" +#include "../game.h" + +#define BUTTON_FONT_SIZE 36 + +typedef struct Button{ + Texture2D textures[3]; // [0]: Normal [1]: Hovered [2]: Pressed + Vector2 position; + Vector2 centerPosition; + char text[20]; + int state; // 0: default 1: hovered 2: pressed + int id; +} Button; + +Button * InitButton(Texture2D textures[3], Vector2 *position, char *text, int textLEN, int id); + +// executes the logic of one button of certain id - huge switch? +void ButtonExecuteButton(Button *button, Game * game); + +int ButtonUpdateButtonState(Button * button); + +void ButtonDrawButton(Button * button); + +int ButtonisButtonPressed(Button * button); + +int ButtonisButtonHovered(Button * button); + +#endif \ No newline at end of file diff --git a/Ui/buttons.h b/Ui/buttons.h deleted file mode 100644 index 15d2a75..0000000 --- a/Ui/buttons.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef BUTTONS_H_ -#define BUTTONS_H_ - -#include "raylib.h" -#include "../game.h" - -typedef struct Button{ - Texture2D *textures[3]; // [0]: Normal [1]: Hovered [2]: Pressed - Vector2 position; - //char text[20]; - int state; // 0: default 1: hovered 2: pressed - int id; -} Button; - -// executes the logic of one button of certain id - huge switch? -void executeButton(Button *button, Game * game); - -int updateButtonState(Button * button); - -void drawButton(Button * button); - -int isButtonPressed(Button * button); - -int isButtonHovered(Button * button); - -#endif \ No newline at end of file diff --git a/Ui/uiContainer.c b/Ui/uiContainer.c new file mode 100644 index 0000000..d5f9a37 --- /dev/null +++ b/Ui/uiContainer.c @@ -0,0 +1,42 @@ +#include "uiContainer.h" +#include "../game.h" +#include "button.h" +#include "raylib.h" +#include "stdlib.h" +#include "stdio.h" + +UiContainer * UiContainerInitPauseUiContainer(){ + UiContainer *uiContainer = malloc(sizeof(UiContainer)); + + Texture2D textures[3] = { LoadTexture("assets/button.png"), + LoadTexture("assets/button_hovered.png"), + LoadTexture("assets/button_pressed.png")}; + Vector2 position = (Vector2){GetScreenWidth()/2 - textures[0].width/2, GetScreenHeight()/2 + 150}; + + Button *continuebutton = InitButton(textures, &position, "Continue", 9, 0); + uiContainer->buttons[0] = continuebutton; + uiContainer->buttonCounter = 1; + + // Methode funktioniert wieso auch immer auch ohne dieses return. C returned Implizit odder was O_o + return uiContainer; +} + +UiContainer * UiContainerInitGameUiContainer(){ + +} + +void UiContainerUpdateUiContainer(UiContainer *uiContainer, Game *game){ + int i = 0; + for(i=0 ; i < uiContainer->buttonCounter; i++){ + ButtonUpdateButtonState(uiContainer->buttons[i]); + if(uiContainer->buttons[i]->state == 2){ + ButtonExecuteButton(uiContainer->buttons[i], game); + } + } +} +void UiContainerDrawUiContainer(UiContainer *uiContainer){ + int i = 0; + for(i=0 ; i < uiContainer->buttonCounter; i++){ + ButtonDrawButton(uiContainer->buttons[i]); + } +} \ No newline at end of file diff --git a/Ui/uiContainer.h b/Ui/uiContainer.h new file mode 100644 index 0000000..16c9f25 --- /dev/null +++ b/Ui/uiContainer.h @@ -0,0 +1,21 @@ +#ifndef UICONTAINER_H_ +#define UICONTAINER_H_ + +#include "raylib.h" +#include "button.h" +#include "../game.h" + +typedef struct UiContainer{ + Button *buttons[15]; + int buttonCounter; +} UiContainer; + +// executes the logic of one button of certain id - huge switch? +void UiContainerUpdateUiContainer(UiContainer *uiContainer, Game *game); +void UiContainerDrawUiContainer(UiContainer *uiContainer); + +UiContainer * UiContainerInitPauseUiContainer(); +UiContainer * UiContainerInitGameUiContainer(); + + +#endif \ No newline at end of file diff --git a/main.c b/main.c index 3de0b84..39b276b 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,5 @@ #include "raylib.h" +#include "string.h" #include #include #include "sprite.h" @@ -10,74 +11,24 @@ #include "DepthSorting/bucket.h" #include "DepthSorting/mergeSort.h" #include "Ui/screenIDs.h" -#include "Ui/buttons.h" +#include "Ui/button.h" +#include "Ui/uiContainer.h" int main(){ - InitWindow(1600, 900, "basic window"); + InitWindow(1280, 720, "basic window"); Game *game = GameInit(); + // TODO: Screen structs, die zum Beispiel die UiContainer enthalten? + UiContainer *pauseScreenUiContainer = UiContainerInitPauseUiContainer(); + // Hides the operating systems own cursor HideCursor(); SetTargetFPS(60); - return uitest(game); - // GAME MAIN ROUTINE - while(!WindowShouldClose()){ - - ListActAllSprites(game); - - ClearBackground(RAYWHITE); - BeginDrawing(); - - BeginMode2D(*(game->camera)); - - //IsometricRendererRenderIsometricMap(game); - //ListDrawAllSprites(game->sprites, game->layers, game->camera); - IsometricMapDraw(game); - - EndMode2D(); - - // Moving cursor Sprite to Mouse Pos and drawing it - game->cursorSprite->x = game->inputHandler->cursorPos.x; - game->cursorSprite->y = game->inputHandler->cursorPos.y; - DrawSpriteToScreen(game->cursorSprite); - - // User Input Handling - mouseInput(game); - keyboardInput(game->inputHandler, game->camera); - - DrawFPS(GetScreenWidth() - 95, 10); - - EndDrawing(); - - } - - CloseWindow(); - - return 0; - -} - - -int uitest(Game * game){ - - Texture2D button = LoadTexture("assets/button.png"); - Texture2D buttonHovered = LoadTexture("assets/button_hovered.png"); - Texture2D buttonPressed = LoadTexture("assets/button_pressed.png"); - - Button continuebutton; - continuebutton.id = 0; - continuebutton.position = (Vector2){GetScreenWidth()/2, GetScreenHeight()/2}; - continuebutton.state = 0; - - continuebutton.textures[0] = &button; - continuebutton.textures[1] = &buttonHovered; - continuebutton.textures[2] = &buttonPressed; - while(!WindowShouldClose()){ // Moving cursor Sprite to Mouse Pos @@ -137,12 +88,8 @@ int uitest(Game * game){ int textWidthHalf = MeasureText("Paused", 28) / 2; DrawText("Paused", GetScreenWidth()/2 - textWidthHalf, GetScreenHeight()/2 - 14, 28, WHITE); - printf("Vorher \n"); - drawButton(&continuebutton); - printf("Nachher \n"); - if(continuebutton.state == 2){ - executeButton(&continuebutton, game); - } + UiContainerUpdateUiContainer(pauseScreenUiContainer, game); + UiContainerDrawUiContainer(pauseScreenUiContainer); DrawSpriteToScreen(game->cursorSprite); DrawFPS(GetScreenWidth() - 95, 10); @@ -166,4 +113,6 @@ int uitest(Game * game){ CloseWindow(); return 0; -} \ No newline at end of file + +} + From e6784b1e8b0e34c0f97e7825af5ec93c7e570cff Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Wed, 4 Jan 2023 09:42:17 +0100 Subject: [PATCH 07/16] DrawRect fix merged --- animation.o | Bin 0 -> 2648 bytes animationHandler.o | Bin 0 -> 2432 bytes bucket.o | Bin 0 -> 1760 bytes button.o | Bin 0 -> 4216 bytes game.o | Bin 0 -> 3744 bytes inputHandler.o | Bin 0 -> 6864 bytes isometricMap.o | Bin 0 -> 8056 bytes list.o | Bin 0 -> 6088 bytes main.o | Bin 0 -> 5312 bytes mergeSort.o | Bin 0 -> 1376 bytes spiel | Bin 0 -> 41320 bytes sprite.o | Bin 0 -> 3672 bytes textureatlas.o | Bin 0 -> 5136 bytes uiContainer.o | Bin 0 -> 3184 bytes 14 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 animation.o create mode 100644 animationHandler.o create mode 100644 bucket.o create mode 100644 button.o create mode 100644 game.o create mode 100644 inputHandler.o create mode 100644 isometricMap.o create mode 100644 list.o create mode 100644 main.o create mode 100644 mergeSort.o create mode 100755 spiel create mode 100644 sprite.o create mode 100644 textureatlas.o create mode 100644 uiContainer.o diff --git a/animation.o b/animation.o new file mode 100644 index 0000000000000000000000000000000000000000..75e4a759373d08db7729ffd8a67a6dde7cf7974f GIT binary patch literal 2648 zcmc&#&ubGw6rMD-joNA~9txF`Q>kFrL<-s>vTaDREzy?R926zp)YTS~O-MGKVB1H5eUWy3yeX}#oWD=p^!3UG~=6kd zVAoi4CQ-%)dz-e&O_TMrKKAqU@UM(j`(nNL9^ML*qXDN?OYB>98aq7HH_Z@t5xo0J zNsCyur;V*a^0lVcGYzX2)>Ew=6I~ea_A*wjx<{TptG1&SYglz=z1*%Q$wzi(-!Cl8 z`H&A&O=?+R2wAmx^d(y;lOh(v1c$!9_j|YaCO%egwN+NDQ97!rkWv{<2bw+6OhTb= zGtE?5wYn}$MPaTLH!q?1`GzO&M8{%PK8tN!iW<>zBX-`$aVSZ;Y2bh!qmjCiVO@-E z0}IlCob?q8JYHadwQyjluQ#+w7w#P47?8{ONt_D5>WcUGxD-HB_^tvcN#RHOH=6!C zz)3FR0!x2zB!CFyKY^1Z*5V)Ke&5sni_mWN9!Nc9Q`huLDRt&Qs>uCo$ zt~@$QM3C{9L_vHr$XRcN`)N9$tdny~*boi=khF%g*kAA~grknk=ih*^>jK{(4dL9A z&e1^pJ3$fW909hwTClyO>FiuGc{8z?U7VUuC$g+y=krA+ zG+DL_PQ2{co}=bhoU)fJ7hO*Wr|sp3d@X41pU;z|e;@dQ^+Rw*Rs0P{eY}rs8NVy` zgLoB>hjlrwk@m{IUXfPW$=inKta;41XL~j? za+L}*mWzdgLwp!+(Q^#Ci(?fJT=??`Zq+E2izT9Mof*7>vy#0Ja>WY%O+_djROu(% zBn!H!i=0$!)N#x=CAy?+h@7Jj}QbH(7vLZH&JA0glo)4@ORV8tL9+6)a Uoxd~W?3DjjtUs?Nldb3f0hB(;H~;_u literal 0 HcmV?d00001 diff --git a/animationHandler.o b/animationHandler.o new file mode 100644 index 0000000000000000000000000000000000000000..21f4c0199b4af28ebb7939fd4855839e1427820e GIT binary patch literal 2432 zcmbtV%}*0S6n||IP=PL{AtV^nlYvCmmT&-LWT9!hCXEoJ#u!am$^wOUOWJJ$#?KIq zwHJ=)$+IVp-h_BSZvF`#G--l~G37vv5#O7gX_sY*iN0j!z4^V*c{8*7IGTugJsuF` zfosrM2^4vALspomKnJu#&41x%QZ0W~*S-bS^26%;AS$b5pq8TtYK2C!s+J`ZcNB?f z7|M`}BB>kd_Gh2!`J`4rtuRzAPqbS00jh<>Isf;qn!i)&Uf=y-%PC>b11lXG)%=p$ zUGv}GCJ$z936g^7ovk_lzNW;;6lND1*?w2Qc(jB%t+%;7W@cI?e?g+#qkt@O8G!T+QgL1gf!kJ$a&eVKrK>S7$yZ~E-`EU>gEC!zYli*pAJUwkKt?StQ z^N7y+0<7|kg-b|$TP(v z$c4PMNau4o-9Vj@H+31`c7M^-(o1|jZ*n}HjyqrWTSs1Q&SD6e_$3?^ z^I!eL=u4^WcLJBN$@7bP2_tf@hY=&w5Gif+j{8%6cH(e-A7iK#nBDG+8|Y#?i5Pv& zob^|^e-L$ca@N0yN-}l&w{l>^?u@e2pKhVs`S;R~3Tc|n0CfKJ6&3#C{M~Ys%NvoO p?}NSxXI%U#rt|C(f+2qYDzvZ>4_8MzQF8Nt!Rr^_1L5HG{{u4QO2PmD literal 0 HcmV?d00001 diff --git a/bucket.o b/bucket.o new file mode 100644 index 0000000000000000000000000000000000000000..b9b0c0a4afcf74939a3528aaa23aa33fe49dfbb9 GIT binary patch literal 1760 zcmbtT&1(};5TDIQ8#OhlR0vkep2V*{lG20rAlrl_YY8^k1iVPt#MMgkMe+izP(2ic zkc)qUNB;zGwt7gt_2N}>5dwOVT#5*FX7{~jvu-asF#CS<+xgABee?EJI+yV&3P@An z9*iT&0=)H)v1UOHW*`is$ilCp-uAcnyKrH>-BT8zN=5|$nS-=Lsx?V6C@ z*Fugq18hST2fcj2TC|XIbT9~ZKiW}PIT}T7?vrv{IryF`eEtO4RBA=NUMzR&yrbS_ z%PhW_=vYzWKAP ztH_a)eWgeGV)V5yH8bV=f*C}38_g;JKTo{g`aLH}dy%`DRQavlPjVFbVd`(v;-}Bx zy*KQ)PGwSZ9>YtHeOlj+++}p@R!pYDtuuHicPd*ZXB9|V;C}r%hf+4To?Ok9)-#!n zbfHvOP3F=is2SC2qax~F5i8B;0{ZV0+f>2h{Ah+_W9^+9H_E`;yk)PO61B{#!MM52 zfju#}0j%6^1FJM@HM5Rfy}?a}cVe;4jmnmYpVd38*=jV+7T*D8RWLV8Pg_RK9QXVW zq@tGYha%A$n?a0oRnAUl8IvWjr!o(Gd36kbWedOdNe@*c28@E8o9_FTRV-D5) zSA7DtR5On5G})i(J5BbN>k7V<*qOKHMSA3}AxD47#2vyoFZ3#6r^)k^Tp0nSy7f(= zzataH>efF--fMm_kNJ^S>gD{rdQ+=+a{pqbf9ITso;dgHkb*<;K}!@kOq4riW)XSm NSU* literal 0 HcmV?d00001 diff --git a/button.o b/button.o new file mode 100644 index 0000000000000000000000000000000000000000..c84cdd091b30690b3f9ec65684c140b4c730e941 GIT binary patch literal 4216 zcmbtWUuauZ7(Z!hm+7{owaQ>)hOtREx7f~s+bD9=CG8osTe~e|!bX?2SEsH`Np8Az zxLL_ocDW1-zWAsjg0P3FFBQS{&s^t|5hj*_QlUz*6DEBLBGlh^?m5}%O;Uz_aB{x$ z`~H95x%cLsczbJ=&&L$`*emSONui7t);;14!5VA>ThEq)TmDXP`!}9@(8%pe3*64m zaXT?A=b^aHoblCj#8|al0$vw1(_x=#i|o9>UGsj@CoE z*=gNoN4IIx21pSq+5l;z)4I=&?&D5;ZYdZF$la(0Q&2x9@QKd$(M`GsYQFIanu= zw>$et_q*w0%j`=9wCf?Ex~kE4bt1b3=tE~D4+ptIb#?<2s_%i6)j6J)av1MjY3x+M*)9|!_W*Np(EVyezotl?|yD%H7{R|wUl^qLI zot@{Cb5-0Yw@EkH@7(cmrwbFT;r5Au6AjrI;{BL?$1Og0JA5ZT&&H{Ir(^!wx9|SC zyo}&?kqox@yb8;a31PTLrzVlYtQ2&{Fuuebop^4d{hMu2QMGwS6G~wAr}DvuDcGZ) z!~(y5u|4L*=f5H=`@T$Sj60|G?<a(6xd{m~H`L;WmVLbMVE<;OLJqRU*0^B za-&3vMJpCnO@I{km>CC0ufnDzaJj6zmDb9vxq?^Cdh3cAs2ZsKtJXjTv9Ty?J9zLw zxFOM#9k8aca7}r!msFH`27j#f3#RenVJKV6`1iFvOW4jNS@F_3p-e z7mqUEg^+L4x;23@G;}j?T0}2VgX0@Qqg4mj*Z6n(pdw_=LJGgMEBR%TG8V=Rc)L+1gSNh@aJz;7}+CYEp{-M7Mpn5q^!s)}T@b@*G=B)5qc@IdxR>NZwr;XlKNV0s=gRA$!6%Vf72cLLw_59uT;OhBfk<4(v zmF&T8rQQ9k;?m~1WW=J!A%f>7$s#?O42z^w?x8o;-){~;HjuK+2)>28Ggh+qEqQ)@ zAR8G>rv}ZmH4Gc_WS;GQEuHK)WhVb`3&Wfq3GW-*07kT5_TN3Zx{9ZL6Bdomz|yH8 zKMe)>ygdaWvFb~*Q7S(#ad{mj%Gj_ct`bOh>d1D1BcK1(z6rMEQ$B{^TzXr(cM7AO zYSn2!4rJe`gWyM`J>{p9%3tj*5Gr2RyYZOyAB7QpwY~Y@l=flWDR|X?1-}V~;(P7$ z(tb`U%H3;k0xviJhcs}|n7c7L(v?v5YX0S7lgUkaAy3N0=-p2LA-wkF(>r@WEFkaS ZpLEd3+iQB)m$M(CfFR4=ioag_e*u^JnaKbE literal 0 HcmV?d00001 diff --git a/game.o b/game.o new file mode 100644 index 0000000000000000000000000000000000000000..df4b9e15e49b291c1d0c543f5bba0fc5d639a878 GIT binary patch literal 3744 zcmbuBO>7%Q6vt=d^gD?YT8T=Hz(Ccyl&qYzNQ5HlB-+H0+$L(`Qw70wHy;q&k-Ziz zBzA-)gyjMj7Y=a9u{Xl4aA?vN$&nCJgg9_;C4-EV$Vdp~1fmW9x1LGHn_WoYNi*~2 zH}l@SnRz>QMho^gC<+szuvgi3Pf*4@N49mpsrp$9Yi1knr~V8Da=(lOvcGzle#FQc zjRtbs+8t7Ay?kgbkb7@|2J+fkAU{v)S3jZp`aV{>3k4=cdGc+brI%1~fA>wxT!FlD zC!`ip>cF`Bx8)6Yo4-+-B-lY4)?~w4ZP+mzcHD-w+c1yBivE+EkQym0)CV8P4SS`z z0Xnz*Cv+4T@zF?eeic0z%F=OEmcv;F;`XFk_boHAZ<&dG6WegN?n8sN%`f&&ocpv} zrjahB?#36TL^i^EgYhoa?vKAjFwmHB1hrzESziG7cNf)JEcskIfx0s@jfFeX)|7sT}vYO zM-R~BiBx@^CuX&mr%?5j9DqZ%Aj~_5;ruLoE+d}VZz&cTm1n;Y3#LD>{|2hTJuW2$ zBp<@;J<9=@gM81kpP5$KZ@gDudw@vU{6#j<*Y~o=8@iT?87WVS}}ypc#x!8EkAI zIMmw{92@HIAJIm~MtgdL+8B$5r>El)Hmct+QVG4sm<}h+*&{QFDMRl|=wU-=!KtKS z(!pdrsvC)^$ffYi4$wClj!o#?)8O@?@zJSiogGDdB$SIyD1Xt9EaVx25aP`!f?p;G zA>M)_c!VIt>Svx3(1t(coE~0EYvJc80SNhVqX_PmxE$x(5~uqW^Ggz^oDlqJp4#MJ z=2so~rw;r(2mZ)``)EOkb=`;qKWzSq*f~Gtz&)mSM(>JQc$YCXc{6H+uc0*(wRTcy z34J=O8b~dsUJn~#rd~@XnVN{#I+1uZs>d)EiyOL%H>)FQgd=b9{zNRL&LrY9dcwE~ z8}g)2j*Taf&Ra|WAH@S>N)hXq?*}6h-+QfBn=5o`PoU7z`cY(A;ZM&B&p-NmPO5m3 z=+7a^DHP)TItiKbn4iDsinU|QOMpW zL+Fj%p5l{5#4p-j3<_PI=d)f2AGFTB0#2{LHGX05;dY`C=P&wiLLr}4`(eJmUrgk! z)t<7@?*0q(F9Ra(neLx{b%ed(c59Pefv>;FH%xC4xwP7oPwU+SF+ZR90d*v?o*%tU PcJ{Y<{Dx#ps@48)%ydq2 literal 0 HcmV?d00001 diff --git a/inputHandler.o b/inputHandler.o new file mode 100644 index 0000000000000000000000000000000000000000..d1c4449975906e8160453d916fda03ce41611495 GIT binary patch literal 6864 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 literal 0 HcmV?d00001 diff --git a/list.o b/list.o new file mode 100644 index 0000000000000000000000000000000000000000..b0440a79a14a385a239a9aebdc2cbb3ff08b88a9 GIT binary patch literal 6088 zcmb_gZEPGz8J_bcja!o3HJIkJ?SVpZOLDOrOEi4xK3IE8?bO6R0wL&fKCkUd?~A>? zq=`rfGATMvl>&bVQj5Z`M*N5nMUWp6y|@LtRRkv#Axq?ki;Cpn6x=vSrix_VXLe?9 zZhfmnz$@+U%rnpXG4sANbGq+n{k?5IACux^Uu2D*L>bdN8tn*gM%YHSfh`3d`!Jzb z{-#gf3h9+o^KWdS!Fdq$ingp*@g(N;N{~0FBkg<$@N^_7+i$<=Hbd-ry=vQd`3vB2 zn+xl0i;;G2ee%>YE5ENRgmW!SRmyXuHK$jm)wsC%v$gV8+f`!Oj*(zA2iq5l_5cDW zkUZ|2D(_uIW_)_p0~F9;yF!_1}a3dsSX4LVvEczSNj+GIR_2x2k2zyYx@Zd-`8&GI9q-?o`W*4I|WS zWn@~rf~5q1b}6u{_G#@(MWY$f9Gvc3=q^&XUe&Jn>J@DU00rs**A`Bbr#dYcjYNX9 zC?o~y?WD`*GMw}AFGP#s)t256Upf~#Evx=o-|_2+2@luc*-?Ge6%>-yxWIt!dV zzOu4%j_~DCeXpHxYb{@xrqURs(zq zQ$J&q+BF|Bs2*4~vU76T7dX4p1}29v^&O2irgoTHU2K4nP@}EWEN#La0vE^hK)xoU z8mI^M%p8jg@^oY;Vz7I`hK1M;3OXVH6%PULxH)16r#5HaVEv|HmVDH zT!&jx^>B4LdfV<_579e%f2GcS`lC!W^nOkqEE}Ra_Nk`1;g&)DVQz?A`dT<~9}4SK z1^qr09#9oFE3Vfl0}__kVq-USh@mRKt+26XNRRyf$v#b|Wb{;#bHtSls+2js@@Hif zr{R2c5VtmFPshU)%5aO_=V!nyodL6S1{}OgX8>IxtYj<~<_qtC% z-4*WY33oqf$}1Q!*O(zidsD4{iAC_sq(+2cETfcahw`nIoM*M5%bY6p$sf%M^} zZ4AED7T@r|X(CV;W1k03@*G}rye-BF7(Wc0@Atq*Jn$cQ z;4GUdS>ZJ6r%&88QkJp5Flw-5U;p#5Xn*qg-rgZ?I5`}R^=nC%OJ%bKn>%P`@>Xxb zJf1Q~S+Q)DxP@o)CBw9O%|hN%`mt2{1<}pe_?OJo@n|+XR5UY|QDV=Q3OU0vGwFd; zanLLrHPROAGpwPsX&Cu~nNe$^(bbL2_=Lq^!B!tG94wgGQI<@WEOL}gPrQ&EOJ%a$ zV>E3ke#mC8naUZ%nViACN?r=))BQ$%oa~F<{(?!9%$#(FhtjF6(~0KCsT0j-aw#iQ z$j2vA`EkSPGCQ6`agqgN_#p=4d8Q{N_a<-aw&bC5lDEgaTua zP@O?gmh0)ETZan`al!UkOOM2l+A!yDRPdJsF8RXDO4WmZNx>gd>>Q9h4~c#3 zj`Na&f0T4&oUbc5?ktJ_L%~)4T?PM`!Vin18h%y&UIka}M-^PPQ&Mo%P8fzs@IfwQ zoQD(~XRgG*rQll?{Di4!uHfHQaNLQK|1Sl9RKXtEa_+$d5hvzjX0KoXyxDJ@|ij@plUT zI&tN?A;dPksQMww()u<6b{K}_d=R5A9NYr$My R_OOS3UBqv}m?Ccd{{Szbck}=N literal 0 HcmV?d00001 diff --git a/main.o b/main.o new file mode 100644 index 0000000000000000000000000000000000000000..9045b7a78225968a8b9f009ce68d5c151b694274 GIT binary patch literal 5312 zcmbuDdu$xV8NlaqZsJf98wigU8a6;6QJR&5CS~m~Xw^R|At5zF{DH(n;i1HFjAKM35-Fe{(l%5DB?O^BlnPL#>-WvW z{=B(WCHN%Y%>3q?`5rSnJL}(Decj748Kxz}wz9>Rrchq7SZ^2AcGkjHvkNV2zZu?9!gb{~U5lixJ8JaYk@iKp$UHBSLy_7u3q zSgmQ9{b%K_ojJC(F8w;&4EF7*dr?Ig65gKu8m73Eo&%j>IR| z*Xyjlim{6!{pNwfxaVqmb`9 zL!-~d)=}YiE}j)-SIs)w6@L=X9DrWflpum1xB+T(P2-tEpWm1{cKn;zIyGm_*Z0Ge z^;&)&jJylW$3$chpfxYXFQ|7-?fiNv*<_sptMhN5g|7Ht@f$KBG#+!klK&XX=X$s0t!+aF+ulFeyM5b$!TOzQ$V-e}CdAm` z21eN_aL?ebXN(7aVT@Ot$PJ5S9vc0!z0T-zxiL@-IQKU9b{P+?FFj(oVPtr2u^bsC zKH_>V4WPQ9eUuYjx|>%Q{yr@A+ePvMKvv7W71C$`39_6Z@*(s5{&EL%FO^8aWjSAmBM$V z@IngrQ~2%_j<1qNe*P(i|1E{Tn!=}3`0*6}aSH!3g@2pESHMPW6xTH=d~FKfn8NQ& z;oT{GFoo|-;cg0lI)y)Hh9viPlA?t&~GgpjqV`Bs3fgACVb&hc-=x~aUjs||!E3pnf>Uv#)0|)u2Y~=kC zzrBm~hJJ-dfm_TwibyahB&!SPl3f-z9rQg=A-FyyQfj z0Gdv;N4p>)UNpkw0t}S>>R73B%nv!F2!7SN;8`UF&V6xO!uwFjI>qr_a5?;GzKL)= z(=@-E@YRHO5Z*#~AL01?>3JR?9IxP-M=AU@#kK!0sP>^0elo%JiT`)SF<#7xwu|Qp zik|-}*<=?~nbcni&kG82)YbE}5svRv&3{2SeoAOQLija=|Az2u3I848*Af0K;Xfh# zFNFV;@V5xRp73eH@x8D8e4p^25q^U3wS@nJ@EZxg850bGd87H+Kse3MgM`!kxP;UE zc!bmZJV&?zwsl;8C7j0lI^pYx{*2;S;9W}JjgAogn~45@2sa4F&oLCt1GT$R@#Op_ z(Z{=l_CH7XErjO@Ur+c>!s$NYgj0Va!s)tC5Kh;9l5o22FDkC%LSIo{CHl8QTgNp^ z_-%xrAbbPi`=E}3^W)!p*Z_G+77P3%)qXj_^>dE*78E_tDz%TrcLU|90Ah&WMSay| z%nTF+ye#AkGKgJ_RV1gZ#&f< z^{OU(dyK<3#Dp5i%fll9ynPq!|GN&7#C4xID*j=vMe;+$%kp(bU6vj4UQ zs?`2#yag(a;y;fsN042z5b@(VqQ~p_w*o`^ZAwoU|5o-fJ}NqXUG_kyu2a2MG}b_p zy7--eUp>kA^>`yOhxT7%{O-UxljGZz{dTRW%H;T818fRxTlqhMlMzXd{~r*xA$|Y= literal 0 HcmV?d00001 diff --git a/mergeSort.o b/mergeSort.o new file mode 100644 index 0000000000000000000000000000000000000000..84c8b38d95d81d7c03e6a07d9a40100b8de13939 GIT binary patch literal 1376 zcmbtTPfHs?6n~qIf2(a2LBUeusVy`^A_~@n1VS`I^$-bok-AC81nO>NcNSF8dJ=N; zBluASFMb4%Uc6iCA@ow;+nq@!W4zP{Z{B;q_kQ!{?aclvep^jg7AUb`1-g+!0d^Bz zKOeby7=t(P=iP_Dl~U`z)H-Rm!pDo9Ygj83meZdq)zA}R`YT&t*-S2sqTK0xmSq=M z?sJUeK1tLR>HzB6W(Ba#6=60i$y98>Ixd5Cn6hTahK4WjfbS6}C7Gn9_%?N(D2xxT zV*$l42+fv+-~alh?Y@)KS+wCbqTM;A2BK?6)AV8#*)aGVjPRisaQYIxGLGS-cFt&a zDsj1A=UYu*uo`SAA0SOR6q=xC3Kkr>!l?oagdf|6@&rE=z}at|@D zDLBJx$^^ox{giRt3)z9+Jm9`K0_O95hw;YuJ>PM8)cRG+EVAj&%rBRhyLRT6G1cla zhXG;gJ*iw-Ifga)A2Cnw>3{iOkV|`JQFT%MDX)v_uk0cwm9N*G>Vf8)wMER)>*~3C zjL%R>($U&o%ztMGQ?#eazm$|EX_Ybg+nAtNoL2?X-pPZ`$an-Tom24@-mf=NZfQYz nhz*RQr9DhOVdmWtVR9h3hAg#A`# literal 0 HcmV?d00001 diff --git a/spiel b/spiel new file mode 100755 index 0000000000000000000000000000000000000000..8d1f3b5fc90d51552bf6375af8e143e218b9b805 GIT binary patch literal 41320 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 YBFmMGW01%s|CMc=gT4@|KDMm(KbMe;Q~&?~ literal 0 HcmV?d00001 diff --git a/sprite.o b/sprite.o new file mode 100644 index 0000000000000000000000000000000000000000..83d073c4088c4495d0151ccfeb11655919f996e9 GIT binary patch literal 3672 zcmbtX|7%-S6u)V@EzYgUW*vnMeM2YN*g`u8ZlaR3dF?HBZnn)Fx|zKuuWQ!krM$jq zr%ZpSlU|;a{skib>MvvShbgFCH~IyNL?}|lABxUdoIg|wT12Sl+%L)NTY@kT+}v|N z_k6qOo^v00SMO@C3j~Ow0C|B_RthC#achN-b2d&I$ab+w@gx3UtA4G;t^!18xOhh`ql7(+12owo2%g+`jQf8tO$hI z)Xm=>50t)L^Ge=90e7?stm$`F!w11cL|+1?)O7{T6lX!8)E~BHD4SWvV7UN*C`m(Q zkKBNQw<%bdk4G<0I&UOCTfeamlw?1T&m`E7Nw&0|kadz^w}IUUJCFlHW?{{ZttP_< zC%HEWXAR?|E)79ua5PbNm%0J!z8s=#Gi9ejZX&|kBT4pCl1=kK>DX=UUgo-RIzGb| zxi@x;Gi06JdT=l72d|R}h;2DbpB6XdY!cqDm@BU(&YT4=;#ToaA?i!Z)IGlJc1ADH zIm6dvaMP?Lf}3KcN+Q@48ipw2jXW1>6_NP>OYx2Q2vPSm; z!1x09hS^@HZVFwrDi>lUU8KN8_eK|6srzc#MR$aqim)kPGS05el}`s7YkY`A+r1p0aI{k| z3yj|>V4v2Izg7ePyaxVF4V;YdMvG-g(l*`{UDsQ9rC<+bNxGx!L~EieeWJa+NAFGd zCR)4nH0c~E3i2@CF~^ zRVCNwtzrynZ`ib*i=cy+%z<>jZRD{d|37J90En>Xi8uDegJR)C!EN_~vaODcXfx5B34y>dIT3967^wi{&dYvYfmQZ+AOD9wR$;aKC-Q&PIjN8Lk6$_EU)_H-->9-E{YPbB_@<#rzdqXZ-#tKO!SDH^ W^5f4RzD?Ei&&l|miYn*)`u_sI;|0F} literal 0 HcmV?d00001 diff --git a/textureatlas.o b/textureatlas.o new file mode 100644 index 0000000000000000000000000000000000000000..ddd110bbe7d610d4ffe601c5132a5f1e973b3a2c GIT binary patch literal 5136 zcmd5=TWnNC7@pm2X;GjnA{RkZ9*QNQOA93iMY6OxWk?!YDI1BTSq{6~c4aU1>^X7? zSk1DAlg(liV}f8}^+g_hAn~PwgvDYPqQ*X%n)uK}O$x0^iI@;HS^s~|%y#y0)_^94 zKbbQ#-+cdNZvSjMq;z(;T`nTTMYfaqo@X%^Au(Iz!74-|_<`%FgFR4SsUHXf!I zliHz(w(+nE>p4QrzMJN;f|-Jn#|WXm&g%)R3(6!`K>CS&&k!=M zoCWxtZ!pn6u6#ranIqtzaWgt^-Sk%xl6@ZsV13TauP5_pO(z!^fw8>20=WQC?a(mo#}=S?D&<(V3I8MG@G*P=67yFEWhr$%vl(PP~W1ta+?V8WBX8{ zrDto4#&FR%RWwQlX!=?`%z}mP93;)Xgj-P-=DJdtRgZF*Ly$78)m-o>hl%&W3bV$D zJ=Bic4#q$3<9&y1CiFk}8iyn>uAG7S;Z1(d*a`=Fgnm)VC6}yRV#KLgOU-??FcgC1 zl4v5-q~7^VFtg3F&}D3Pwh)eT3w;H@H_|ljUn=F1G`rz0%S3CgWx7M)XKw)gIQ zW{1QM4}z803(6c`gMz{?!p(P~4Jp-B=A;A!&rABmT-VUTf^w%C2s1U%@Gz}e_>!3| zS!K>Sk0=w=1?dDHq4{Sft<2S?m04F-nSD{Yb9@Z^QAlUYzD8TXoh+%i)5^3fePVh= z-RXW<=HcNRV|;}}hL%cdzW!(*DMNzcwEcI2IJ}ONg?>`;NPP@dEdLU=UId&^E+DuH#3HD`}7WBBLgk2-$}{j=w~3&SKW(8XmSvnq?VC0w4@XA-_#vOg)|DzP%<8mBw#F&)FVFltRbkU}KCZJ1%|5ofs zV)wrl#t>_kIM{rH$B*&JBJ@Sw27{t4^FDdN`R@TGq}t;@&-LqNqtF)XFW}dpf&T6K z*SY?PAoAL-kEhUS|3~q013AFHgy8<;uR)#_d c4#^-jw#Bt|3FZzb{gs%UKy<4reeL>x1NLekqW}N^ literal 0 HcmV?d00001 diff --git a/uiContainer.o b/uiContainer.o new file mode 100644 index 0000000000000000000000000000000000000000..9c52db5591978e30013428e99b7f16622a56a074 GIT binary patch literal 3184 zcmbuAOKclO7=Xui(gw(@JS)n>JpcjGZ45;s2vv^F##?X+YGU93IBR6(B86!(bsK?&ufkT8i6d^>)LxB?oBvf(g1rY%UP>>pdQThMf8GAflU*MN!Xa4Vh z%)j&4eN|7-g+n1CBt#C9t|llUzmIgsac>wW<7A9%P2BcZ#&CZ!R)4D&jKg|x{5UYHA!w7(hM}b%&yX-7>&PO|P_Fko5_;(f3DqY`lsf`@N=7&*u__z?DlXZB*BK@Rd7K7>77@5G-(4)Q2I zI`&yV0kQzW12jbbxDsH3cS38wL^^NVYm0cR)5}ncc&in}clJZi9~LA)A_VV6zeLE6 zJ~#p7TB&|-&4KNQhWn?A4j_o92k@r{@Z|yg_yGR;0R9eetY6gaoe5wca6ZDf#ybnZ zzJV50|IY*X-#m}Y^LS?l*o~kEKsZoiMY$`pUm`!Kr z=jIml#q8p2BCTgh*<4wv78YrpIW{FJ$`{xDQ0DohUOi2R*a>z9>dET`@HV2bgGZu1uokYBi$S z6<^6$%4KSS&8je}!9QZ3cW$}9Y&lxhu2iYbPCyK1qQ&e{8xAk8Q zDBtt-^fljCjIrMX4fiGvO_nvDu*l=_dxS&rrQXe*@8n$k4>=~+$(tk~_mxy~FDRJv zzsARSPIWpl|GYdI_m$BMXX3sJTaG8h`eYHyDf$E$#aQ-xTP=tiRo^4P@vo@5w>XIM zIMIpq7y9!sz?^FQ8V9F^Bk$FCJcU8~zneQQ@i^Rn{2PmSvHwAHV~D{wG|ub5Z{yVg j@t9NHdqCvPVSEyDm$G1rO7L3~6kq3sGA~Q_p~n9Uxcd-8 literal 0 HcmV?d00001 From 96f96d767a11bf9b99c65afab5a34b54e27a3f20 Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Wed, 4 Jan 2023 09:42:25 +0100 Subject: [PATCH 08/16] make clean --- animation.o | Bin 2648 -> 0 bytes animationHandler.o | Bin 2432 -> 0 bytes bucket.o | Bin 1760 -> 0 bytes button.o | Bin 4216 -> 0 bytes game.o | Bin 3744 -> 0 bytes inputHandler.o | Bin 6864 -> 0 bytes isometricMap.o | Bin 8056 -> 0 bytes list.o | Bin 6088 -> 0 bytes main.o | Bin 5312 -> 0 bytes mergeSort.o | Bin 1376 -> 0 bytes spiel | Bin 41320 -> 0 bytes sprite.o | Bin 3672 -> 0 bytes textureatlas.o | Bin 5136 -> 0 bytes uiContainer.o | Bin 3184 -> 0 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 animation.o delete mode 100644 animationHandler.o delete mode 100644 bucket.o delete mode 100644 button.o delete mode 100644 game.o delete mode 100644 inputHandler.o delete mode 100644 isometricMap.o delete mode 100644 list.o delete mode 100644 main.o delete mode 100644 mergeSort.o delete mode 100755 spiel delete mode 100644 sprite.o delete mode 100644 textureatlas.o delete mode 100644 uiContainer.o diff --git a/animation.o b/animation.o deleted file mode 100644 index 75e4a759373d08db7729ffd8a67a6dde7cf7974f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2648 zcmc&#&ubGw6rMD-joNA~9txF`Q>kFrL<-s>vTaDREzy?R926zp)YTS~O-MGKVB1H5eUWy3yeX}#oWD=p^!3UG~=6kd zVAoi4CQ-%)dz-e&O_TMrKKAqU@UM(j`(nNL9^ML*qXDN?OYB>98aq7HH_Z@t5xo0J zNsCyur;V*a^0lVcGYzX2)>Ew=6I~ea_A*wjx<{TptG1&SYglz=z1*%Q$wzi(-!Cl8 z`H&A&O=?+R2wAmx^d(y;lOh(v1c$!9_j|YaCO%egwN+NDQ97!rkWv{<2bw+6OhTb= zGtE?5wYn}$MPaTLH!q?1`GzO&M8{%PK8tN!iW<>zBX-`$aVSZ;Y2bh!qmjCiVO@-E z0}IlCob?q8JYHadwQyjluQ#+w7w#P47?8{ONt_D5>WcUGxD-HB_^tvcN#RHOH=6!C zz)3FR0!x2zB!CFyKY^1Z*5V)Ke&5sni_mWN9!Nc9Q`huLDRt&Qs>uCo$ zt~@$QM3C{9L_vHr$XRcN`)N9$tdny~*boi=khF%g*kAA~grknk=ih*^>jK{(4dL9A z&e1^pJ3$fW909hwTClyO>FiuGc{8z?U7VUuC$g+y=krA+ zG+DL_PQ2{co}=bhoU)fJ7hO*Wr|sp3d@X41pU;z|e;@dQ^+Rw*Rs0P{eY}rs8NVy` zgLoB>hjlrwk@m{IUXfPW$=inKta;41XL~j? za+L}*mWzdgLwp!+(Q^#Ci(?fJT=??`Zq+E2izT9Mof*7>vy#0Ja>WY%O+_djROu(% zBn!H!i=0$!)N#x=CAy?+h@7Jj}QbH(7vLZH&JA0glo)4@ORV8tL9+6)a Uoxd~W?3DjjtUs?Nldb3f0hB(;H~;_u diff --git a/animationHandler.o b/animationHandler.o deleted file mode 100644 index 21f4c0199b4af28ebb7939fd4855839e1427820e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2432 zcmbtV%}*0S6n||IP=PL{AtV^nlYvCmmT&-LWT9!hCXEoJ#u!am$^wOUOWJJ$#?KIq zwHJ=)$+IVp-h_BSZvF`#G--l~G37vv5#O7gX_sY*iN0j!z4^V*c{8*7IGTugJsuF` zfosrM2^4vALspomKnJu#&41x%QZ0W~*S-bS^26%;AS$b5pq8TtYK2C!s+J`ZcNB?f z7|M`}BB>kd_Gh2!`J`4rtuRzAPqbS00jh<>Isf;qn!i)&Uf=y-%PC>b11lXG)%=p$ zUGv}GCJ$z936g^7ovk_lzNW;;6lND1*?w2Qc(jB%t+%;7W@cI?e?g+#qkt@O8G!T+QgL1gf!kJ$a&eVKrK>S7$yZ~E-`EU>gEC!zYli*pAJUwkKt?StQ z^N7y+0<7|kg-b|$TP(v z$c4PMNau4o-9Vj@H+31`c7M^-(o1|jZ*n}HjyqrWTSs1Q&SD6e_$3?^ z^I!eL=u4^WcLJBN$@7bP2_tf@hY=&w5Gif+j{8%6cH(e-A7iK#nBDG+8|Y#?i5Pv& zob^|^e-L$ca@N0yN-}l&w{l>^?u@e2pKhVs`S;R~3Tc|n0CfKJ6&3#C{M~Ys%NvoO p?}NSxXI%U#rt|C(f+2qYDzvZ>4_8MzQF8Nt!Rr^_1L5HG{{u4QO2PmD diff --git a/bucket.o b/bucket.o deleted file mode 100644 index b9b0c0a4afcf74939a3528aaa23aa33fe49dfbb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1760 zcmbtT&1(};5TDIQ8#OhlR0vkep2V*{lG20rAlrl_YY8^k1iVPt#MMgkMe+izP(2ic zkc)qUNB;zGwt7gt_2N}>5dwOVT#5*FX7{~jvu-asF#CS<+xgABee?EJI+yV&3P@An z9*iT&0=)H)v1UOHW*`is$ilCp-uAcnyKrH>-BT8zN=5|$nS-=Lsx?V6C@ z*Fugq18hST2fcj2TC|XIbT9~ZKiW}PIT}T7?vrv{IryF`eEtO4RBA=NUMzR&yrbS_ z%PhW_=vYzWKAP ztH_a)eWgeGV)V5yH8bV=f*C}38_g;JKTo{g`aLH}dy%`DRQavlPjVFbVd`(v;-}Bx zy*KQ)PGwSZ9>YtHeOlj+++}p@R!pYDtuuHicPd*ZXB9|V;C}r%hf+4To?Ok9)-#!n zbfHvOP3F=is2SC2qax~F5i8B;0{ZV0+f>2h{Ah+_W9^+9H_E`;yk)PO61B{#!MM52 zfju#}0j%6^1FJM@HM5Rfy}?a}cVe;4jmnmYpVd38*=jV+7T*D8RWLV8Pg_RK9QXVW zq@tGYha%A$n?a0oRnAUl8IvWjr!o(Gd36kbWedOdNe@*c28@E8o9_FTRV-D5) zSA7DtR5On5G})i(J5BbN>k7V<*qOKHMSA3}AxD47#2vyoFZ3#6r^)k^Tp0nSy7f(= zzataH>efF--fMm_kNJ^S>gD{rdQ+=+a{pqbf9ITso;dgHkb*<;K}!@kOq4riW)XSm NSU* diff --git a/button.o b/button.o deleted file mode 100644 index c84cdd091b30690b3f9ec65684c140b4c730e941..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4216 zcmbtWUuauZ7(Z!hm+7{owaQ>)hOtREx7f~s+bD9=CG8osTe~e|!bX?2SEsH`Np8Az zxLL_ocDW1-zWAsjg0P3FFBQS{&s^t|5hj*_QlUz*6DEBLBGlh^?m5}%O;Uz_aB{x$ z`~H95x%cLsczbJ=&&L$`*emSONui7t);;14!5VA>ThEq)TmDXP`!}9@(8%pe3*64m zaXT?A=b^aHoblCj#8|al0$vw1(_x=#i|o9>UGsj@CoE z*=gNoN4IIx21pSq+5l;z)4I=&?&D5;ZYdZF$la(0Q&2x9@QKd$(M`GsYQFIanu= zw>$et_q*w0%j`=9wCf?Ex~kE4bt1b3=tE~D4+ptIb#?<2s_%i6)j6J)av1MjY3x+M*)9|!_W*Np(EVyezotl?|yD%H7{R|wUl^qLI zot@{Cb5-0Yw@EkH@7(cmrwbFT;r5Au6AjrI;{BL?$1Og0JA5ZT&&H{Ir(^!wx9|SC zyo}&?kqox@yb8;a31PTLrzVlYtQ2&{Fuuebop^4d{hMu2QMGwS6G~wAr}DvuDcGZ) z!~(y5u|4L*=f5H=`@T$Sj60|G?<a(6xd{m~H`L;WmVLbMVE<;OLJqRU*0^B za-&3vMJpCnO@I{km>CC0ufnDzaJj6zmDb9vxq?^Cdh3cAs2ZsKtJXjTv9Ty?J9zLw zxFOM#9k8aca7}r!msFH`27j#f3#RenVJKV6`1iFvOW4jNS@F_3p-e z7mqUEg^+L4x;23@G;}j?T0}2VgX0@Qqg4mj*Z6n(pdw_=LJGgMEBR%TG8V=Rc)L+1gSNh@aJz;7}+CYEp{-M7Mpn5q^!s)}T@b@*G=B)5qc@IdxR>NZwr;XlKNV0s=gRA$!6%Vf72cLLw_59uT;OhBfk<4(v zmF&T8rQQ9k;?m~1WW=J!A%f>7$s#?O42z^w?x8o;-){~;HjuK+2)>28Ggh+qEqQ)@ zAR8G>rv}ZmH4Gc_WS;GQEuHK)WhVb`3&Wfq3GW-*07kT5_TN3Zx{9ZL6Bdomz|yH8 zKMe)>ygdaWvFb~*Q7S(#ad{mj%Gj_ct`bOh>d1D1BcK1(z6rMEQ$B{^TzXr(cM7AO zYSn2!4rJe`gWyM`J>{p9%3tj*5Gr2RyYZOyAB7QpwY~Y@l=flWDR|X?1-}V~;(P7$ z(tb`U%H3;k0xviJhcs}|n7c7L(v?v5YX0S7lgUkaAy3N0=-p2LA-wkF(>r@WEFkaS ZpLEd3+iQB)m$M(CfFR4=ioag_e*u^JnaKbE diff --git a/game.o b/game.o deleted file mode 100644 index df4b9e15e49b291c1d0c543f5bba0fc5d639a878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3744 zcmbuBO>7%Q6vt=d^gD?YT8T=Hz(Ccyl&qYzNQ5HlB-+H0+$L(`Qw70wHy;q&k-Ziz zBzA-)gyjMj7Y=a9u{Xl4aA?vN$&nCJgg9_;C4-EV$Vdp~1fmW9x1LGHn_WoYNi*~2 zH}l@SnRz>QMho^gC<+szuvgi3Pf*4@N49mpsrp$9Yi1knr~V8Da=(lOvcGzle#FQc zjRtbs+8t7Ay?kgbkb7@|2J+fkAU{v)S3jZp`aV{>3k4=cdGc+brI%1~fA>wxT!FlD zC!`ip>cF`Bx8)6Yo4-+-B-lY4)?~w4ZP+mzcHD-w+c1yBivE+EkQym0)CV8P4SS`z z0Xnz*Cv+4T@zF?eeic0z%F=OEmcv;F;`XFk_boHAZ<&dG6WegN?n8sN%`f&&ocpv} zrjahB?#36TL^i^EgYhoa?vKAjFwmHB1hrzESziG7cNf)JEcskIfx0s@jfFeX)|7sT}vYO zM-R~BiBx@^CuX&mr%?5j9DqZ%Aj~_5;ruLoE+d}VZz&cTm1n;Y3#LD>{|2hTJuW2$ zBp<@;J<9=@gM81kpP5$KZ@gDudw@vU{6#j<*Y~o=8@iT?87WVS}}ypc#x!8EkAI zIMmw{92@HIAJIm~MtgdL+8B$5r>El)Hmct+QVG4sm<}h+*&{QFDMRl|=wU-=!KtKS z(!pdrsvC)^$ffYi4$wClj!o#?)8O@?@zJSiogGDdB$SIyD1Xt9EaVx25aP`!f?p;G zA>M)_c!VIt>Svx3(1t(coE~0EYvJc80SNhVqX_PmxE$x(5~uqW^Ggz^oDlqJp4#MJ z=2so~rw;r(2mZ)``)EOkb=`;qKWzSq*f~Gtz&)mSM(>JQc$YCXc{6H+uc0*(wRTcy z34J=O8b~dsUJn~#rd~@XnVN{#I+1uZs>d)EiyOL%H>)FQgd=b9{zNRL&LrY9dcwE~ z8}g)2j*Taf&Ra|WAH@S>N)hXq?*}6h-+QfBn=5o`PoU7z`cY(A;ZM&B&p-NmPO5m3 z=+7a^DHP)TItiKbn4iDsinU|QOMpW zL+Fj%p5l{5#4p-j3<_PI=d)f2AGFTB0#2{LHGX05;dY`C=P&wiLLr}4`(eJmUrgk! z)t<7@?*0q(F9Ra(neLx{b%ed(c59Pefv>;FH%xC4xwP7oPwU+SF+ZR90d*v?o*%tU PcJ{Y<{Dx#ps@48)%ydq2 diff --git a/inputHandler.o b/inputHandler.o deleted file mode 100644 index d1c4449975906e8160453d916fda03ce41611495..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6864 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 diff --git a/list.o b/list.o deleted file mode 100644 index b0440a79a14a385a239a9aebdc2cbb3ff08b88a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6088 zcmb_gZEPGz8J_bcja!o3HJIkJ?SVpZOLDOrOEi4xK3IE8?bO6R0wL&fKCkUd?~A>? zq=`rfGATMvl>&bVQj5Z`M*N5nMUWp6y|@LtRRkv#Axq?ki;Cpn6x=vSrix_VXLe?9 zZhfmnz$@+U%rnpXG4sANbGq+n{k?5IACux^Uu2D*L>bdN8tn*gM%YHSfh`3d`!Jzb z{-#gf3h9+o^KWdS!Fdq$ingp*@g(N;N{~0FBkg<$@N^_7+i$<=Hbd-ry=vQd`3vB2 zn+xl0i;;G2ee%>YE5ENRgmW!SRmyXuHK$jm)wsC%v$gV8+f`!Oj*(zA2iq5l_5cDW zkUZ|2D(_uIW_)_p0~F9;yF!_1}a3dsSX4LVvEczSNj+GIR_2x2k2zyYx@Zd-`8&GI9q-?o`W*4I|WS zWn@~rf~5q1b}6u{_G#@(MWY$f9Gvc3=q^&XUe&Jn>J@DU00rs**A`Bbr#dYcjYNX9 zC?o~y?WD`*GMw}AFGP#s)t256Upf~#Evx=o-|_2+2@luc*-?Ge6%>-yxWIt!dV zzOu4%j_~DCeXpHxYb{@xrqURs(zq zQ$J&q+BF|Bs2*4~vU76T7dX4p1}29v^&O2irgoTHU2K4nP@}EWEN#La0vE^hK)xoU z8mI^M%p8jg@^oY;Vz7I`hK1M;3OXVH6%PULxH)16r#5HaVEv|HmVDH zT!&jx^>B4LdfV<_579e%f2GcS`lC!W^nOkqEE}Ra_Nk`1;g&)DVQz?A`dT<~9}4SK z1^qr09#9oFE3Vfl0}__kVq-USh@mRKt+26XNRRyf$v#b|Wb{;#bHtSls+2js@@Hif zr{R2c5VtmFPshU)%5aO_=V!nyodL6S1{}OgX8>IxtYj<~<_qtC% z-4*WY33oqf$}1Q!*O(zidsD4{iAC_sq(+2cETfcahw`nIoM*M5%bY6p$sf%M^} zZ4AED7T@r|X(CV;W1k03@*G}rye-BF7(Wc0@Atq*Jn$cQ z;4GUdS>ZJ6r%&88QkJp5Flw-5U;p#5Xn*qg-rgZ?I5`}R^=nC%OJ%bKn>%P`@>Xxb zJf1Q~S+Q)DxP@o)CBw9O%|hN%`mt2{1<}pe_?OJo@n|+XR5UY|QDV=Q3OU0vGwFd; zanLLrHPROAGpwPsX&Cu~nNe$^(bbL2_=Lq^!B!tG94wgGQI<@WEOL}gPrQ&EOJ%a$ zV>E3ke#mC8naUZ%nViACN?r=))BQ$%oa~F<{(?!9%$#(FhtjF6(~0KCsT0j-aw#iQ z$j2vA`EkSPGCQ6`agqgN_#p=4d8Q{N_a<-aw&bC5lDEgaTua zP@O?gmh0)ETZan`al!UkOOM2l+A!yDRPdJsF8RXDO4WmZNx>gd>>Q9h4~c#3 zj`Na&f0T4&oUbc5?ktJ_L%~)4T?PM`!Vin18h%y&UIka}M-^PPQ&Mo%P8fzs@IfwQ zoQD(~XRgG*rQll?{Di4!uHfHQaNLQK|1Sl9RKXtEa_+$d5hvzjX0KoXyxDJ@|ij@plUT zI&tN?A;dPksQMww()u<6b{K}_d=R5A9NYr$My R_OOS3UBqv}m?Ccd{{Szbck}=N diff --git a/main.o b/main.o deleted file mode 100644 index 9045b7a78225968a8b9f009ce68d5c151b694274..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5312 zcmbuDdu$xV8NlaqZsJf98wigU8a6;6QJR&5CS~m~Xw^R|At5zF{DH(n;i1HFjAKM35-Fe{(l%5DB?O^BlnPL#>-WvW z{=B(WCHN%Y%>3q?`5rSnJL}(Decj748Kxz}wz9>Rrchq7SZ^2AcGkjHvkNV2zZu?9!gb{~U5lixJ8JaYk@iKp$UHBSLy_7u3q zSgmQ9{b%K_ojJC(F8w;&4EF7*dr?Ig65gKu8m73Eo&%j>IR| z*Xyjlim{6!{pNwfxaVqmb`9 zL!-~d)=}YiE}j)-SIs)w6@L=X9DrWflpum1xB+T(P2-tEpWm1{cKn;zIyGm_*Z0Ge z^;&)&jJylW$3$chpfxYXFQ|7-?fiNv*<_sptMhN5g|7Ht@f$KBG#+!klK&XX=X$s0t!+aF+ulFeyM5b$!TOzQ$V-e}CdAm` z21eN_aL?ebXN(7aVT@Ot$PJ5S9vc0!z0T-zxiL@-IQKU9b{P+?FFj(oVPtr2u^bsC zKH_>V4WPQ9eUuYjx|>%Q{yr@A+ePvMKvv7W71C$`39_6Z@*(s5{&EL%FO^8aWjSAmBM$V z@IngrQ~2%_j<1qNe*P(i|1E{Tn!=}3`0*6}aSH!3g@2pESHMPW6xTH=d~FKfn8NQ& z;oT{GFoo|-;cg0lI)y)Hh9viPlA?t&~GgpjqV`Bs3fgACVb&hc-=x~aUjs||!E3pnf>Uv#)0|)u2Y~=kC zzrBm~hJJ-dfm_TwibyahB&!SPl3f-z9rQg=A-FyyQfj z0Gdv;N4p>)UNpkw0t}S>>R73B%nv!F2!7SN;8`UF&V6xO!uwFjI>qr_a5?;GzKL)= z(=@-E@YRHO5Z*#~AL01?>3JR?9IxP-M=AU@#kK!0sP>^0elo%JiT`)SF<#7xwu|Qp zik|-}*<=?~nbcni&kG82)YbE}5svRv&3{2SeoAOQLija=|Az2u3I848*Af0K;Xfh# zFNFV;@V5xRp73eH@x8D8e4p^25q^U3wS@nJ@EZxg850bGd87H+Kse3MgM`!kxP;UE zc!bmZJV&?zwsl;8C7j0lI^pYx{*2;S;9W}JjgAogn~45@2sa4F&oLCt1GT$R@#Op_ z(Z{=l_CH7XErjO@Ur+c>!s$NYgj0Va!s)tC5Kh;9l5o22FDkC%LSIo{CHl8QTgNp^ z_-%xrAbbPi`=E}3^W)!p*Z_G+77P3%)qXj_^>dE*78E_tDz%TrcLU|90Ah&WMSay| z%nTF+ye#AkGKgJ_RV1gZ#&f< z^{OU(dyK<3#Dp5i%fll9ynPq!|GN&7#C4xID*j=vMe;+$%kp(bU6vj4UQ zs?`2#yag(a;y;fsN042z5b@(VqQ~p_w*o`^ZAwoU|5o-fJ}NqXUG_kyu2a2MG}b_p zy7--eUp>kA^>`yOhxT7%{O-UxljGZz{dTRW%H;T818fRxTlqhMlMzXd{~r*xA$|Y= diff --git a/mergeSort.o b/mergeSort.o deleted file mode 100644 index 84c8b38d95d81d7c03e6a07d9a40100b8de13939..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1376 zcmbtTPfHs?6n~qIf2(a2LBUeusVy`^A_~@n1VS`I^$-bok-AC81nO>NcNSF8dJ=N; zBluASFMb4%Uc6iCA@ow;+nq@!W4zP{Z{B;q_kQ!{?aclvep^jg7AUb`1-g+!0d^Bz zKOeby7=t(P=iP_Dl~U`z)H-Rm!pDo9Ygj83meZdq)zA}R`YT&t*-S2sqTK0xmSq=M z?sJUeK1tLR>HzB6W(Ba#6=60i$y98>Ixd5Cn6hTahK4WjfbS6}C7Gn9_%?N(D2xxT zV*$l42+fv+-~alh?Y@)KS+wCbqTM;A2BK?6)AV8#*)aGVjPRisaQYIxGLGS-cFt&a zDsj1A=UYu*uo`SAA0SOR6q=xC3Kkr>!l?oagdf|6@&rE=z}at|@D zDLBJx$^^ox{giRt3)z9+Jm9`K0_O95hw;YuJ>PM8)cRG+EVAj&%rBRhyLRT6G1cla zhXG;gJ*iw-Ifga)A2Cnw>3{iOkV|`JQFT%MDX)v_uk0cwm9N*G>Vf8)wMER)>*~3C zjL%R>($U&o%ztMGQ?#eazm$|EX_Ybg+nAtNoL2?X-pPZ`$an-Tom24@-mf=NZfQYz nhz*RQr9DhOVdmWtVR9h3hAg#A`# diff --git a/spiel b/spiel deleted file mode 100755 index 8d1f3b5fc90d51552bf6375af8e143e218b9b805..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41320 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 YBFmMGW01%s|CMc=gT4@|KDMm(KbMe;Q~&?~ diff --git a/sprite.o b/sprite.o deleted file mode 100644 index 83d073c4088c4495d0151ccfeb11655919f996e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3672 zcmbtX|7%-S6u)V@EzYgUW*vnMeM2YN*g`u8ZlaR3dF?HBZnn)Fx|zKuuWQ!krM$jq zr%ZpSlU|;a{skib>MvvShbgFCH~IyNL?}|lABxUdoIg|wT12Sl+%L)NTY@kT+}v|N z_k6qOo^v00SMO@C3j~Ow0C|B_RthC#achN-b2d&I$ab+w@gx3UtA4G;t^!18xOhh`ql7(+12owo2%g+`jQf8tO$hI z)Xm=>50t)L^Ge=90e7?stm$`F!w11cL|+1?)O7{T6lX!8)E~BHD4SWvV7UN*C`m(Q zkKBNQw<%bdk4G<0I&UOCTfeamlw?1T&m`E7Nw&0|kadz^w}IUUJCFlHW?{{ZttP_< zC%HEWXAR?|E)79ua5PbNm%0J!z8s=#Gi9ejZX&|kBT4pCl1=kK>DX=UUgo-RIzGb| zxi@x;Gi06JdT=l72d|R}h;2DbpB6XdY!cqDm@BU(&YT4=;#ToaA?i!Z)IGlJc1ADH zIm6dvaMP?Lf}3KcN+Q@48ipw2jXW1>6_NP>OYx2Q2vPSm; z!1x09hS^@HZVFwrDi>lUU8KN8_eK|6srzc#MR$aqim)kPGS05el}`s7YkY`A+r1p0aI{k| z3yj|>V4v2Izg7ePyaxVF4V;YdMvG-g(l*`{UDsQ9rC<+bNxGx!L~EieeWJa+NAFGd zCR)4nH0c~E3i2@CF~^ zRVCNwtzrynZ`ib*i=cy+%z<>jZRD{d|37J90En>Xi8uDegJR)C!EN_~vaODcXfx5B34y>dIT3967^wi{&dYvYfmQZ+AOD9wR$;aKC-Q&PIjN8Lk6$_EU)_H-->9-E{YPbB_@<#rzdqXZ-#tKO!SDH^ W^5f4RzD?Ei&&l|miYn*)`u_sI;|0F} diff --git a/textureatlas.o b/textureatlas.o deleted file mode 100644 index ddd110bbe7d610d4ffe601c5132a5f1e973b3a2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5136 zcmd5=TWnNC7@pm2X;GjnA{RkZ9*QNQOA93iMY6OxWk?!YDI1BTSq{6~c4aU1>^X7? zSk1DAlg(liV}f8}^+g_hAn~PwgvDYPqQ*X%n)uK}O$x0^iI@;HS^s~|%y#y0)_^94 zKbbQ#-+cdNZvSjMq;z(;T`nTTMYfaqo@X%^Au(Iz!74-|_<`%FgFR4SsUHXf!I zliHz(w(+nE>p4QrzMJN;f|-Jn#|WXm&g%)R3(6!`K>CS&&k!=M zoCWxtZ!pn6u6#ranIqtzaWgt^-Sk%xl6@ZsV13TauP5_pO(z!^fw8>20=WQC?a(mo#}=S?D&<(V3I8MG@G*P=67yFEWhr$%vl(PP~W1ta+?V8WBX8{ zrDto4#&FR%RWwQlX!=?`%z}mP93;)Xgj-P-=DJdtRgZF*Ly$78)m-o>hl%&W3bV$D zJ=Bic4#q$3<9&y1CiFk}8iyn>uAG7S;Z1(d*a`=Fgnm)VC6}yRV#KLgOU-??FcgC1 zl4v5-q~7^VFtg3F&}D3Pwh)eT3w;H@H_|ljUn=F1G`rz0%S3CgWx7M)XKw)gIQ zW{1QM4}z803(6c`gMz{?!p(P~4Jp-B=A;A!&rABmT-VUTf^w%C2s1U%@Gz}e_>!3| zS!K>Sk0=w=1?dDHq4{Sft<2S?m04F-nSD{Yb9@Z^QAlUYzD8TXoh+%i)5^3fePVh= z-RXW<=HcNRV|;}}hL%cdzW!(*DMNzcwEcI2IJ}ONg?>`;NPP@dEdLU=UId&^E+DuH#3HD`}7WBBLgk2-$}{j=w~3&SKW(8XmSvnq?VC0w4@XA-_#vOg)|DzP%<8mBw#F&)FVFltRbkU}KCZJ1%|5ofs zV)wrl#t>_kIM{rH$B*&JBJ@Sw27{t4^FDdN`R@TGq}t;@&-LqNqtF)XFW}dpf&T6K z*SY?PAoAL-kEhUS|3~q013AFHgy8<;uR)#_d c4#^-jw#Bt|3FZzb{gs%UKy<4reeL>x1NLekqW}N^ diff --git a/uiContainer.o b/uiContainer.o deleted file mode 100644 index 9c52db5591978e30013428e99b7f16622a56a074..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3184 zcmbuAOKclO7=Xui(gw(@JS)n>JpcjGZ45;s2vv^F##?X+YGU93IBR6(B86!(bsK?&ufkT8i6d^>)LxB?oBvf(g1rY%UP>>pdQThMf8GAflU*MN!Xa4Vh z%)j&4eN|7-g+n1CBt#C9t|llUzmIgsac>wW<7A9%P2BcZ#&CZ!R)4D&jKg|x{5UYHA!w7(hM}b%&yX-7>&PO|P_Fko5_;(f3DqY`lsf`@N=7&*u__z?DlXZB*BK@Rd7K7>77@5G-(4)Q2I zI`&yV0kQzW12jbbxDsH3cS38wL^^NVYm0cR)5}ncc&in}clJZi9~LA)A_VV6zeLE6 zJ~#p7TB&|-&4KNQhWn?A4j_o92k@r{@Z|yg_yGR;0R9eetY6gaoe5wca6ZDf#ybnZ zzJV50|IY*X-#m}Y^LS?l*o~kEKsZoiMY$`pUm`!Kr z=jIml#q8p2BCTgh*<4wv78YrpIW{FJ$`{xDQ0DohUOi2R*a>z9>dET`@HV2bgGZu1uokYBi$S z6<^6$%4KSS&8je}!9QZ3cW$}9Y&lxhu2iYbPCyK1qQ&e{8xAk8Q zDBtt-^fljCjIrMX4fiGvO_nvDu*l=_dxS&rrQXe*@8n$k4>=~+$(tk~_mxy~FDRJv zzsARSPIWpl|GYdI_m$BMXX3sJTaG8h`eYHyDf$E$#aQ-xTP=tiRo^4P@vo@5w>XIM zIMIpq7y9!sz?^FQ8V9F^Bk$FCJcU8~zneQQ@i^Rn{2PmSvHwAHV~D{wG|ub5Z{yVg j@t9NHdqCvPVSEyDm$G1rO7L3~6kq3sGA~Q_p~n9Uxcd-8 From 23e78574f826576d32472df978a2b8cfa745d473 Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Wed, 4 Jan 2023 13:55:00 +0100 Subject: [PATCH 09/16] hmmm --- Ui/button.c | 54 +++++++++++++++------------------------------ Ui/button.h | 17 ++++++++------ Ui/uiContainer.c | 17 +++++++++----- animation.o | Bin 0 -> 2648 bytes animationHandler.o | Bin 0 -> 2432 bytes bucket.o | Bin 0 -> 1760 bytes button.o | Bin 0 -> 3480 bytes game.o | Bin 0 -> 3744 bytes inputHandler.o | Bin 0 -> 6864 bytes isometricMap.o | Bin 0 -> 8056 bytes list.o | Bin 0 -> 6088 bytes main.o | Bin 0 -> 5312 bytes mergeSort.o | Bin 0 -> 1376 bytes spiel | Bin 0 -> 41272 bytes sprite.o | Bin 0 -> 3672 bytes textureatlas.o | Bin 0 -> 5136 bytes uiContainer.o | Bin 0 -> 3264 bytes 17 files changed, 39 insertions(+), 49 deletions(-) create mode 100644 animation.o create mode 100644 animationHandler.o create mode 100644 bucket.o create mode 100644 button.o create mode 100644 game.o create mode 100644 inputHandler.o create mode 100644 isometricMap.o create mode 100644 list.o create mode 100644 main.o create mode 100644 mergeSort.o create mode 100755 spiel create mode 100644 sprite.o create mode 100644 textureatlas.o create mode 100644 uiContainer.o diff --git a/Ui/button.c b/Ui/button.c index 4e77dac..e62a877 100644 --- a/Ui/button.c +++ b/Ui/button.c @@ -6,27 +6,28 @@ #include "raylib.h" #include "string.h" -Button * InitButton(Texture2D textures[3], Vector2 *position, char *text, int textLEN, int id){ +Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text, int textLEN, int id){ Button *button = malloc(sizeof(Button)); button->textures[0] = textures[0]; button->textures[1] = textures[1]; button->textures[2] = textures[2]; + button->textures[3] = textures[3]; button->position = (Vector2){position->x, position->y}; button->centerPosition = (Vector2){position->x + textures[0].width/2, position->y + textures[0].height/2}; strncpy(button->text, text, textLEN); - button->state = 0; + button->state = BUTTON_STATE_DEFAULT; button->id = id; return button; } void ButtonExecuteButton(Button *button, Game *game){ - button->state = 0; + button->state = BUTTON_STATE_DEFAULT; switch(button->id){ - case 0: // continue game + case BUTTON_ID_CONTINUE: // continue game if(game->screen == SCREEN_PAUSE){ game->screen = SCREEN_GAME; } @@ -35,49 +36,30 @@ void ButtonExecuteButton(Button *button, Game *game){ } void ButtonDrawButton(Button * button){ - ButtonUpdateButtonState(button); + // erst Button Texture, dann Text zentriert drauf DrawTexture(button->textures[button->state], button->position.x, button->position.y, WHITE); DrawText(button->text, button->centerPosition.x - MeasureText(button->text, BUTTON_FONT_SIZE)/2, button->centerPosition.y - BUTTON_FONT_SIZE/2, BUTTON_FONT_SIZE, BLACK); } int ButtonUpdateButtonState(Button * button){ - if(GetMouseX() > button->position.x && + if(button->state == BUTTON_STATE_RELEASED){ + // Wir verlassen den RELEASED State automatisch wenn wir den Code des Buttons ausführen, siehe ButtonExecuteButton + // So lange der Code nicht ausgeführt wurde bleiben wir im state damit er definitiv im nächsten Frame ausgeführt wird + return button->state; + } + else if(GetMouseX() > button->position.x && GetMouseX() < button->position.x + button->textures[button->state].width && GetMouseY() > button->position.y && GetMouseY() < button->position.y + button->textures[button->state].height ){ - if(IsMouseButtonPressed(MOUSE_BUTTON_LEFT)){ - button->state = 2; - return 2; + if(IsMouseButtonDown(MOUSE_BUTTON_LEFT)){ + return button->state = BUTTON_STATE_PRESSED; } - button->state = 1; - return 1; - } - button->state = 0; - return 0; -} - -int ButtonIsButtonHovered(Button * button){ - if(GetMouseX() > button->position.x && - GetMouseX() < button->position.x + button->textures[0].width && - GetMouseY() > button->position.y && - GetMouseY() < button->position.y + button->textures[0].height - ){ - return button->state = 1; - } - return button->state = 0; -} - -int ButtonIsButtonPressed(Button * button){ - if(GetMouseX() > button->position.x && - GetMouseX() < button->position.x + button->textures[0].width && - GetMouseY() > button->position.y && - GetMouseY() < button->position.y + button->textures[0].height - ){ - if(IsMouseButtonPressed(MOUSE_LEFT_BUTTON)){ - return button->state = 2; + else if(button->state == BUTTON_STATE_PRESSED){ + return button->state = BUTTON_STATE_RELEASED; } + return button->state = BUTTON_STATE_HOVERED; } - return button->state = 0; + return button->state = BUTTON_STATE_DEFAULT; } diff --git a/Ui/button.h b/Ui/button.h index 77673d9..df33050 100644 --- a/Ui/button.h +++ b/Ui/button.h @@ -6,16 +6,23 @@ #define BUTTON_FONT_SIZE 36 +#define BUTTON_STATE_DEFAULT 0 +#define BUTTON_STATE_HOVERED 1 +#define BUTTON_STATE_PRESSED 2 +#define BUTTON_STATE_RELEASED 3 + +#define BUTTON_ID_CONTINUE 0 + typedef struct Button{ - Texture2D textures[3]; // [0]: Normal [1]: Hovered [2]: Pressed + Texture2D textures[4]; // [0]: Normal [1]: Hovered [2]: Pressed [3]: Released Vector2 position; Vector2 centerPosition; char text[20]; - int state; // 0: default 1: hovered 2: pressed + int state; // 0: default 1: hovered 2: pressed 3: released int id; } Button; -Button * InitButton(Texture2D textures[3], Vector2 *position, char *text, int textLEN, int id); +Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text, int textLEN, int id); // executes the logic of one button of certain id - huge switch? void ButtonExecuteButton(Button *button, Game * game); @@ -24,8 +31,4 @@ int ButtonUpdateButtonState(Button * button); void ButtonDrawButton(Button * button); -int ButtonisButtonPressed(Button * button); - -int ButtonisButtonHovered(Button * button); - #endif \ No newline at end of file diff --git a/Ui/uiContainer.c b/Ui/uiContainer.c index d5f9a37..264e180 100644 --- a/Ui/uiContainer.c +++ b/Ui/uiContainer.c @@ -8,12 +8,13 @@ UiContainer * UiContainerInitPauseUiContainer(){ UiContainer *uiContainer = malloc(sizeof(UiContainer)); - Texture2D textures[3] = { LoadTexture("assets/button.png"), - LoadTexture("assets/button_hovered.png"), - LoadTexture("assets/button_pressed.png")}; + Texture2D textures[4] = { LoadTexture("assets/button.png"), //DEFAULT + LoadTexture("assets/button_hovered.png"), //HOVERED + LoadTexture("assets/button_pressed.png"), //PRESSED + LoadTexture("assets/button_pressed.png")}; //RELEASED Vector2 position = (Vector2){GetScreenWidth()/2 - textures[0].width/2, GetScreenHeight()/2 + 150}; - Button *continuebutton = InitButton(textures, &position, "Continue", 9, 0); + Button *continuebutton = ButtonInitButton(textures, &position, "Continue", 9, BUTTON_ID_CONTINUE); uiContainer->buttons[0] = continuebutton; uiContainer->buttonCounter = 1; @@ -22,18 +23,22 @@ UiContainer * UiContainerInitPauseUiContainer(){ } UiContainer * UiContainerInitGameUiContainer(){ - + printf("\n\n\n\n UiContainerInitGameUiContainer not implemented yet!! \n\n\n\n"); + return 0; } +// Updated alle Buttons und führt gegebenenfalls deren Code aus void UiContainerUpdateUiContainer(UiContainer *uiContainer, Game *game){ int i = 0; for(i=0 ; i < uiContainer->buttonCounter; i++){ ButtonUpdateButtonState(uiContainer->buttons[i]); - if(uiContainer->buttons[i]->state == 2){ + if(uiContainer->buttons[i]->state == BUTTON_STATE_RELEASED){ ButtonExecuteButton(uiContainer->buttons[i], game); } } } + +// Drawed alle Buttons void UiContainerDrawUiContainer(UiContainer *uiContainer){ int i = 0; for(i=0 ; i < uiContainer->buttonCounter; i++){ diff --git a/animation.o b/animation.o new file mode 100644 index 0000000000000000000000000000000000000000..75e4a759373d08db7729ffd8a67a6dde7cf7974f GIT binary patch literal 2648 zcmc&#&ubGw6rMD-joNA~9txF`Q>kFrL<-s>vTaDREzy?R926zp)YTS~O-MGKVB1H5eUWy3yeX}#oWD=p^!3UG~=6kd zVAoi4CQ-%)dz-e&O_TMrKKAqU@UM(j`(nNL9^ML*qXDN?OYB>98aq7HH_Z@t5xo0J zNsCyur;V*a^0lVcGYzX2)>Ew=6I~ea_A*wjx<{TptG1&SYglz=z1*%Q$wzi(-!Cl8 z`H&A&O=?+R2wAmx^d(y;lOh(v1c$!9_j|YaCO%egwN+NDQ97!rkWv{<2bw+6OhTb= zGtE?5wYn}$MPaTLH!q?1`GzO&M8{%PK8tN!iW<>zBX-`$aVSZ;Y2bh!qmjCiVO@-E z0}IlCob?q8JYHadwQyjluQ#+w7w#P47?8{ONt_D5>WcUGxD-HB_^tvcN#RHOH=6!C zz)3FR0!x2zB!CFyKY^1Z*5V)Ke&5sni_mWN9!Nc9Q`huLDRt&Qs>uCo$ zt~@$QM3C{9L_vHr$XRcN`)N9$tdny~*boi=khF%g*kAA~grknk=ih*^>jK{(4dL9A z&e1^pJ3$fW909hwTClyO>FiuGc{8z?U7VUuC$g+y=krA+ zG+DL_PQ2{co}=bhoU)fJ7hO*Wr|sp3d@X41pU;z|e;@dQ^+Rw*Rs0P{eY}rs8NVy` zgLoB>hjlrwk@m{IUXfPW$=inKta;41XL~j? za+L}*mWzdgLwp!+(Q^#Ci(?fJT=??`Zq+E2izT9Mof*7>vy#0Ja>WY%O+_djROu(% zBn!H!i=0$!)N#x=CAy?+h@7Jj}QbH(7vLZH&JA0glo)4@ORV8tL9+6)a Uoxd~W?3DjjtUs?Nldb3f0hB(;H~;_u literal 0 HcmV?d00001 diff --git a/animationHandler.o b/animationHandler.o new file mode 100644 index 0000000000000000000000000000000000000000..21f4c0199b4af28ebb7939fd4855839e1427820e GIT binary patch literal 2432 zcmbtV%}*0S6n||IP=PL{AtV^nlYvCmmT&-LWT9!hCXEoJ#u!am$^wOUOWJJ$#?KIq zwHJ=)$+IVp-h_BSZvF`#G--l~G37vv5#O7gX_sY*iN0j!z4^V*c{8*7IGTugJsuF` zfosrM2^4vALspomKnJu#&41x%QZ0W~*S-bS^26%;AS$b5pq8TtYK2C!s+J`ZcNB?f z7|M`}BB>kd_Gh2!`J`4rtuRzAPqbS00jh<>Isf;qn!i)&Uf=y-%PC>b11lXG)%=p$ zUGv}GCJ$z936g^7ovk_lzNW;;6lND1*?w2Qc(jB%t+%;7W@cI?e?g+#qkt@O8G!T+QgL1gf!kJ$a&eVKrK>S7$yZ~E-`EU>gEC!zYli*pAJUwkKt?StQ z^N7y+0<7|kg-b|$TP(v z$c4PMNau4o-9Vj@H+31`c7M^-(o1|jZ*n}HjyqrWTSs1Q&SD6e_$3?^ z^I!eL=u4^WcLJBN$@7bP2_tf@hY=&w5Gif+j{8%6cH(e-A7iK#nBDG+8|Y#?i5Pv& zob^|^e-L$ca@N0yN-}l&w{l>^?u@e2pKhVs`S;R~3Tc|n0CfKJ6&3#C{M~Ys%NvoO p?}NSxXI%U#rt|C(f+2qYDzvZ>4_8MzQF8Nt!Rr^_1L5HG{{u4QO2PmD literal 0 HcmV?d00001 diff --git a/bucket.o b/bucket.o new file mode 100644 index 0000000000000000000000000000000000000000..b9b0c0a4afcf74939a3528aaa23aa33fe49dfbb9 GIT binary patch literal 1760 zcmbtT&1(};5TDIQ8#OhlR0vkep2V*{lG20rAlrl_YY8^k1iVPt#MMgkMe+izP(2ic zkc)qUNB;zGwt7gt_2N}>5dwOVT#5*FX7{~jvu-asF#CS<+xgABee?EJI+yV&3P@An z9*iT&0=)H)v1UOHW*`is$ilCp-uAcnyKrH>-BT8zN=5|$nS-=Lsx?V6C@ z*Fugq18hST2fcj2TC|XIbT9~ZKiW}PIT}T7?vrv{IryF`eEtO4RBA=NUMzR&yrbS_ z%PhW_=vYzWKAP ztH_a)eWgeGV)V5yH8bV=f*C}38_g;JKTo{g`aLH}dy%`DRQavlPjVFbVd`(v;-}Bx zy*KQ)PGwSZ9>YtHeOlj+++}p@R!pYDtuuHicPd*ZXB9|V;C}r%hf+4To?Ok9)-#!n zbfHvOP3F=is2SC2qax~F5i8B;0{ZV0+f>2h{Ah+_W9^+9H_E`;yk)PO61B{#!MM52 zfju#}0j%6^1FJM@HM5Rfy}?a}cVe;4jmnmYpVd38*=jV+7T*D8RWLV8Pg_RK9QXVW zq@tGYha%A$n?a0oRnAUl8IvWjr!o(Gd36kbWedOdNe@*c28@E8o9_FTRV-D5) zSA7DtR5On5G})i(J5BbN>k7V<*qOKHMSA3}AxD47#2vyoFZ3#6r^)k^Tp0nSy7f(= zzataH>efF--fMm_kNJ^S>gD{rdQ+=+a{pqbf9ITso;dgHkb*<;K}!@kOq4riW)XSm NSU* literal 0 HcmV?d00001 diff --git a/button.o b/button.o new file mode 100644 index 0000000000000000000000000000000000000000..0e6eab8b434f7806364131b42a245e47013e02f8 GIT binary patch literal 3480 zcmbtVUrbw77(b})%pUh>=1kNF2W1)C9<(Mr@QBMy(D{J&r7@cNeW&M?!=?D3UvlpGzTfxv zp6|QoeiZ5p*Ek$Rl7qZTb|r}t()`RWuW?o*4WynFJjecwQT8*<{?{5ECg7G<$b z*1r*Cq5Pc>!FC(%DGL>;)epwBFVJ{1KcXi<=P_|GOXaa4E6+X@a z#}#cWXdzXg6|`+uxRV7s6>S%2gP`pKZO{t$u|OZSLR$ro*DZF<1x&HvIZPvh(V~jU zwxzjPZuQp}9Qhx?>eNcXGjd<(Bj^eSZo5HFM4}^t(MGM%22JEqq)T)h_D#y}QT9Xm zFaTcH41O-aTCqHf%%JUqwaS6A`63+V4x*~5HuLd{c?{4U>slTHWQ#7d0mXGLIssZ< zezOuL5FLWnc(FBKl)fziEpF5kQi9gOlUlKDIGXNgA?P^`Z&{WiD6ODm4I1DLCkH)C zJf!R)U42wT9b)?fbj_6gM6C{L%|SccDVud$gI+e^Ww{{xKFHR~ubaK=`;vT(ue-R; zHcymFq{P8aVjaI zT=kivs-(b~#XA2bg?mqm4~FkRoN}$#SBxg~hry}=OoVz87EHESV@f>^l+>RTK6pV$ ztWjV9N$kNI3d;e~+tc%kuQfJdCJobf&VSb5cBb9rQv218HhioVdWl3+pLZ zy%%Bx%347T(<3#NH{zHZB#s%c<7nL>_cGMc0yr+D0jw+3;9aQcsjqcX2bgeO7uP~u z+@=01Y6~U9RYRKXGPV&gU_R58!LCkfN%M^EIBMtf~G)a~Ju&R88xwdeh=N z%eUU^<>aTd7emR(Ppuk$Xg|p9@y+*>lRUj21jI>d_u=?EXjJOwXAjs>SlCB9wF6KM z?>qq40LS<;F7F*+QGtJo2Mfe|2D=WcTKxA9z~>LZ7XZh+Is7hwc)wx)99FgXHxIyX z9e|Sw(=bv=e}Z&#=6v$9QRc{4Z{Nl4K;PKKaCj&b9g7CK`$A)6Dn2=xN|20^P9~;j zg;!`sPnd=-9LrlU9ls&~WTX0wVWxG`ug5d6qevt!qQs`(ipwBF2C$@8H~Ld%Mjxqg zuaol`4v8eGD@k}WLQe1}&Nd-+u>Qhd3s8sX3*vZ}OZ-J~o`~Z)N_;@zxZ$@i@p;Am zu!7%K@J0oHqTqN}$T+p)Q^LF|enG*XQ|vDvfZtN^BZ|EbcqB|OO5n1_pS!r6<8d1< z=lHq}m-9#bnb|2LJ^{OtF7KBlm)0laeghlphepPUeRl8RvY#K`S=Ib+i24o17g@XiKeEZUZ~y=R literal 0 HcmV?d00001 diff --git a/game.o b/game.o new file mode 100644 index 0000000000000000000000000000000000000000..df4b9e15e49b291c1d0c543f5bba0fc5d639a878 GIT binary patch literal 3744 zcmbuBO>7%Q6vt=d^gD?YT8T=Hz(Ccyl&qYzNQ5HlB-+H0+$L(`Qw70wHy;q&k-Ziz zBzA-)gyjMj7Y=a9u{Xl4aA?vN$&nCJgg9_;C4-EV$Vdp~1fmW9x1LGHn_WoYNi*~2 zH}l@SnRz>QMho^gC<+szuvgi3Pf*4@N49mpsrp$9Yi1knr~V8Da=(lOvcGzle#FQc zjRtbs+8t7Ay?kgbkb7@|2J+fkAU{v)S3jZp`aV{>3k4=cdGc+brI%1~fA>wxT!FlD zC!`ip>cF`Bx8)6Yo4-+-B-lY4)?~w4ZP+mzcHD-w+c1yBivE+EkQym0)CV8P4SS`z z0Xnz*Cv+4T@zF?eeic0z%F=OEmcv;F;`XFk_boHAZ<&dG6WegN?n8sN%`f&&ocpv} zrjahB?#36TL^i^EgYhoa?vKAjFwmHB1hrzESziG7cNf)JEcskIfx0s@jfFeX)|7sT}vYO zM-R~BiBx@^CuX&mr%?5j9DqZ%Aj~_5;ruLoE+d}VZz&cTm1n;Y3#LD>{|2hTJuW2$ zBp<@;J<9=@gM81kpP5$KZ@gDudw@vU{6#j<*Y~o=8@iT?87WVS}}ypc#x!8EkAI zIMmw{92@HIAJIm~MtgdL+8B$5r>El)Hmct+QVG4sm<}h+*&{QFDMRl|=wU-=!KtKS z(!pdrsvC)^$ffYi4$wClj!o#?)8O@?@zJSiogGDdB$SIyD1Xt9EaVx25aP`!f?p;G zA>M)_c!VIt>Svx3(1t(coE~0EYvJc80SNhVqX_PmxE$x(5~uqW^Ggz^oDlqJp4#MJ z=2so~rw;r(2mZ)``)EOkb=`;qKWzSq*f~Gtz&)mSM(>JQc$YCXc{6H+uc0*(wRTcy z34J=O8b~dsUJn~#rd~@XnVN{#I+1uZs>d)EiyOL%H>)FQgd=b9{zNRL&LrY9dcwE~ z8}g)2j*Taf&Ra|WAH@S>N)hXq?*}6h-+QfBn=5o`PoU7z`cY(A;ZM&B&p-NmPO5m3 z=+7a^DHP)TItiKbn4iDsinU|QOMpW zL+Fj%p5l{5#4p-j3<_PI=d)f2AGFTB0#2{LHGX05;dY`C=P&wiLLr}4`(eJmUrgk! z)t<7@?*0q(F9Ra(neLx{b%ed(c59Pefv>;FH%xC4xwP7oPwU+SF+ZR90d*v?o*%tU PcJ{Y<{Dx#ps@48)%ydq2 literal 0 HcmV?d00001 diff --git a/inputHandler.o b/inputHandler.o new file mode 100644 index 0000000000000000000000000000000000000000..d1c4449975906e8160453d916fda03ce41611495 GIT binary patch literal 6864 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 literal 0 HcmV?d00001 diff --git a/list.o b/list.o new file mode 100644 index 0000000000000000000000000000000000000000..b0440a79a14a385a239a9aebdc2cbb3ff08b88a9 GIT binary patch literal 6088 zcmb_gZEPGz8J_bcja!o3HJIkJ?SVpZOLDOrOEi4xK3IE8?bO6R0wL&fKCkUd?~A>? zq=`rfGATMvl>&bVQj5Z`M*N5nMUWp6y|@LtRRkv#Axq?ki;Cpn6x=vSrix_VXLe?9 zZhfmnz$@+U%rnpXG4sANbGq+n{k?5IACux^Uu2D*L>bdN8tn*gM%YHSfh`3d`!Jzb z{-#gf3h9+o^KWdS!Fdq$ingp*@g(N;N{~0FBkg<$@N^_7+i$<=Hbd-ry=vQd`3vB2 zn+xl0i;;G2ee%>YE5ENRgmW!SRmyXuHK$jm)wsC%v$gV8+f`!Oj*(zA2iq5l_5cDW zkUZ|2D(_uIW_)_p0~F9;yF!_1}a3dsSX4LVvEczSNj+GIR_2x2k2zyYx@Zd-`8&GI9q-?o`W*4I|WS zWn@~rf~5q1b}6u{_G#@(MWY$f9Gvc3=q^&XUe&Jn>J@DU00rs**A`Bbr#dYcjYNX9 zC?o~y?WD`*GMw}AFGP#s)t256Upf~#Evx=o-|_2+2@luc*-?Ge6%>-yxWIt!dV zzOu4%j_~DCeXpHxYb{@xrqURs(zq zQ$J&q+BF|Bs2*4~vU76T7dX4p1}29v^&O2irgoTHU2K4nP@}EWEN#La0vE^hK)xoU z8mI^M%p8jg@^oY;Vz7I`hK1M;3OXVH6%PULxH)16r#5HaVEv|HmVDH zT!&jx^>B4LdfV<_579e%f2GcS`lC!W^nOkqEE}Ra_Nk`1;g&)DVQz?A`dT<~9}4SK z1^qr09#9oFE3Vfl0}__kVq-USh@mRKt+26XNRRyf$v#b|Wb{;#bHtSls+2js@@Hif zr{R2c5VtmFPshU)%5aO_=V!nyodL6S1{}OgX8>IxtYj<~<_qtC% z-4*WY33oqf$}1Q!*O(zidsD4{iAC_sq(+2cETfcahw`nIoM*M5%bY6p$sf%M^} zZ4AED7T@r|X(CV;W1k03@*G}rye-BF7(Wc0@Atq*Jn$cQ z;4GUdS>ZJ6r%&88QkJp5Flw-5U;p#5Xn*qg-rgZ?I5`}R^=nC%OJ%bKn>%P`@>Xxb zJf1Q~S+Q)DxP@o)CBw9O%|hN%`mt2{1<}pe_?OJo@n|+XR5UY|QDV=Q3OU0vGwFd; zanLLrHPROAGpwPsX&Cu~nNe$^(bbL2_=Lq^!B!tG94wgGQI<@WEOL}gPrQ&EOJ%a$ zV>E3ke#mC8naUZ%nViACN?r=))BQ$%oa~F<{(?!9%$#(FhtjF6(~0KCsT0j-aw#iQ z$j2vA`EkSPGCQ6`agqgN_#p=4d8Q{N_a<-aw&bC5lDEgaTua zP@O?gmh0)ETZan`al!UkOOM2l+A!yDRPdJsF8RXDO4WmZNx>gd>>Q9h4~c#3 zj`Na&f0T4&oUbc5?ktJ_L%~)4T?PM`!Vin18h%y&UIka}M-^PPQ&Mo%P8fzs@IfwQ zoQD(~XRgG*rQll?{Di4!uHfHQaNLQK|1Sl9RKXtEa_+$d5hvzjX0KoXyxDJ@|ij@plUT zI&tN?A;dPksQMww()u<6b{K}_d=R5A9NYr$My R_OOS3UBqv}m?Ccd{{Szbck}=N literal 0 HcmV?d00001 diff --git a/main.o b/main.o new file mode 100644 index 0000000000000000000000000000000000000000..9045b7a78225968a8b9f009ce68d5c151b694274 GIT binary patch literal 5312 zcmbuDdu$xV8NlaqZsJf98wigU8a6;6QJR&5CS~m~Xw^R|At5zF{DH(n;i1HFjAKM35-Fe{(l%5DB?O^BlnPL#>-WvW z{=B(WCHN%Y%>3q?`5rSnJL}(Decj748Kxz}wz9>Rrchq7SZ^2AcGkjHvkNV2zZu?9!gb{~U5lixJ8JaYk@iKp$UHBSLy_7u3q zSgmQ9{b%K_ojJC(F8w;&4EF7*dr?Ig65gKu8m73Eo&%j>IR| z*Xyjlim{6!{pNwfxaVqmb`9 zL!-~d)=}YiE}j)-SIs)w6@L=X9DrWflpum1xB+T(P2-tEpWm1{cKn;zIyGm_*Z0Ge z^;&)&jJylW$3$chpfxYXFQ|7-?fiNv*<_sptMhN5g|7Ht@f$KBG#+!klK&XX=X$s0t!+aF+ulFeyM5b$!TOzQ$V-e}CdAm` z21eN_aL?ebXN(7aVT@Ot$PJ5S9vc0!z0T-zxiL@-IQKU9b{P+?FFj(oVPtr2u^bsC zKH_>V4WPQ9eUuYjx|>%Q{yr@A+ePvMKvv7W71C$`39_6Z@*(s5{&EL%FO^8aWjSAmBM$V z@IngrQ~2%_j<1qNe*P(i|1E{Tn!=}3`0*6}aSH!3g@2pESHMPW6xTH=d~FKfn8NQ& z;oT{GFoo|-;cg0lI)y)Hh9viPlA?t&~GgpjqV`Bs3fgACVb&hc-=x~aUjs||!E3pnf>Uv#)0|)u2Y~=kC zzrBm~hJJ-dfm_TwibyahB&!SPl3f-z9rQg=A-FyyQfj z0Gdv;N4p>)UNpkw0t}S>>R73B%nv!F2!7SN;8`UF&V6xO!uwFjI>qr_a5?;GzKL)= z(=@-E@YRHO5Z*#~AL01?>3JR?9IxP-M=AU@#kK!0sP>^0elo%JiT`)SF<#7xwu|Qp zik|-}*<=?~nbcni&kG82)YbE}5svRv&3{2SeoAOQLija=|Az2u3I848*Af0K;Xfh# zFNFV;@V5xRp73eH@x8D8e4p^25q^U3wS@nJ@EZxg850bGd87H+Kse3MgM`!kxP;UE zc!bmZJV&?zwsl;8C7j0lI^pYx{*2;S;9W}JjgAogn~45@2sa4F&oLCt1GT$R@#Op_ z(Z{=l_CH7XErjO@Ur+c>!s$NYgj0Va!s)tC5Kh;9l5o22FDkC%LSIo{CHl8QTgNp^ z_-%xrAbbPi`=E}3^W)!p*Z_G+77P3%)qXj_^>dE*78E_tDz%TrcLU|90Ah&WMSay| z%nTF+ye#AkGKgJ_RV1gZ#&f< z^{OU(dyK<3#Dp5i%fll9ynPq!|GN&7#C4xID*j=vMe;+$%kp(bU6vj4UQ zs?`2#yag(a;y;fsN042z5b@(VqQ~p_w*o`^ZAwoU|5o-fJ}NqXUG_kyu2a2MG}b_p zy7--eUp>kA^>`yOhxT7%{O-UxljGZz{dTRW%H;T818fRxTlqhMlMzXd{~r*xA$|Y= literal 0 HcmV?d00001 diff --git a/mergeSort.o b/mergeSort.o new file mode 100644 index 0000000000000000000000000000000000000000..84c8b38d95d81d7c03e6a07d9a40100b8de13939 GIT binary patch literal 1376 zcmbtTPfHs?6n~qIf2(a2LBUeusVy`^A_~@n1VS`I^$-bok-AC81nO>NcNSF8dJ=N; zBluASFMb4%Uc6iCA@ow;+nq@!W4zP{Z{B;q_kQ!{?aclvep^jg7AUb`1-g+!0d^Bz zKOeby7=t(P=iP_Dl~U`z)H-Rm!pDo9Ygj83meZdq)zA}R`YT&t*-S2sqTK0xmSq=M z?sJUeK1tLR>HzB6W(Ba#6=60i$y98>Ixd5Cn6hTahK4WjfbS6}C7Gn9_%?N(D2xxT zV*$l42+fv+-~alh?Y@)KS+wCbqTM;A2BK?6)AV8#*)aGVjPRisaQYIxGLGS-cFt&a zDsj1A=UYu*uo`SAA0SOR6q=xC3Kkr>!l?oagdf|6@&rE=z}at|@D zDLBJx$^^ox{giRt3)z9+Jm9`K0_O95hw;YuJ>PM8)cRG+EVAj&%rBRhyLRT6G1cla zhXG;gJ*iw-Ifga)A2Cnw>3{iOkV|`JQFT%MDX)v_uk0cwm9N*G>Vf8)wMER)>*~3C zjL%R>($U&o%ztMGQ?#eazm$|EX_Ybg+nAtNoL2?X-pPZ`$an-Tom24@-mf=NZfQYz nhz*RQr9DhOVdmWtVR9h3hAg#A`# literal 0 HcmV?d00001 diff --git a/spiel b/spiel new file mode 100755 index 0000000000000000000000000000000000000000..63354e10b112e6f09d314e7c1f091d27bddf4bd1 GIT binary patch literal 41272 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 W^5f4RzD?Ei&&l|miYn*)`u_sI;|0F} literal 0 HcmV?d00001 diff --git a/textureatlas.o b/textureatlas.o new file mode 100644 index 0000000000000000000000000000000000000000..ddd110bbe7d610d4ffe601c5132a5f1e973b3a2c GIT binary patch literal 5136 zcmd5=TWnNC7@pm2X;GjnA{RkZ9*QNQOA93iMY6OxWk?!YDI1BTSq{6~c4aU1>^X7? zSk1DAlg(liV}f8}^+g_hAn~PwgvDYPqQ*X%n)uK}O$x0^iI@;HS^s~|%y#y0)_^94 zKbbQ#-+cdNZvSjMq;z(;T`nTTMYfaqo@X%^Au(Iz!74-|_<`%FgFR4SsUHXf!I zliHz(w(+nE>p4QrzMJN;f|-Jn#|WXm&g%)R3(6!`K>CS&&k!=M zoCWxtZ!pn6u6#ranIqtzaWgt^-Sk%xl6@ZsV13TauP5_pO(z!^fw8>20=WQC?a(mo#}=S?D&<(V3I8MG@G*P=67yFEWhr$%vl(PP~W1ta+?V8WBX8{ zrDto4#&FR%RWwQlX!=?`%z}mP93;)Xgj-P-=DJdtRgZF*Ly$78)m-o>hl%&W3bV$D zJ=Bic4#q$3<9&y1CiFk}8iyn>uAG7S;Z1(d*a`=Fgnm)VC6}yRV#KLgOU-??FcgC1 zl4v5-q~7^VFtg3F&}D3Pwh)eT3w;H@H_|ljUn=F1G`rz0%S3CgWx7M)XKw)gIQ zW{1QM4}z803(6c`gMz{?!p(P~4Jp-B=A;A!&rABmT-VUTf^w%C2s1U%@Gz}e_>!3| zS!K>Sk0=w=1?dDHq4{Sft<2S?m04F-nSD{Yb9@Z^QAlUYzD8TXoh+%i)5^3fePVh= z-RXW<=HcNRV|;}}hL%cdzW!(*DMNzcwEcI2IJ}ONg?>`;NPP@dEdLU=UId&^E+DuH#3HD`}7WBBLgk2-$}{j=w~3&SKW(8XmSvnq?VC0w4@XA-_#vOg)|DzP%<8mBw#F&)FVFltRbkU}KCZJ1%|5ofs zV)wrl#t>_kIM{rH$B*&JBJ@Sw27{t4^FDdN`R@TGq}t;@&-LqNqtF)XFW}dpf&T6K z*SY?PAoAL-kEhUS|3~q013AFHgy8<;uR)#_d c4#^-jw#Bt|3FZzb{gs%UKy<4reeL>x1NLekqW}N^ literal 0 HcmV?d00001 diff --git a/uiContainer.o b/uiContainer.o new file mode 100644 index 0000000000000000000000000000000000000000..6f9d2fa88ea61deee02bd664061faaec1a2baab8 GIT binary patch literal 3264 zcmbtW-D@LN6u;B7TV4B+6-BYD#s`-wcDB(KtcawE(~O$6x^2`4bvjM%HgTItoZQ*X z%Bq!$><|ihk_rp1Am|_9gFe|+q4hKcM=EQgV{ywlDX!sV^h%@Nuhk(2Hn5nfwl=Apg}$ zrJt~pU9VGCKfdTOR(156vqU-&t5iKpU0UoBsksz#!$_v;u(IP(Lb936qlxkSqUSI# zF{Pi-Cnu6#;3eODa8jQ2KXpOiw zHZ*uc3%2Sg;5bm?xOK)z{N29H@S)hC29zN7SP&)TCe$LH#%P%P5|6(v$NL%q0c&62 z@uxcC(_sM~Qx&$-PyV{D;^@bE-ay2~ukFl=1*_AEg>`VXx+O*iyFox=1b=b2#E5kH zrErWKlDyCy1$DF3f3W6&9fyJYr-}hUFFY54zZiipMd0Tm@QV@n`+#HrqVM2L0EUkQ z;$ygRAi-Gx{R50%{r?$(<5P=uF7Z0SnE~!m@O#xEUKy{AU3RFe7fAlVd(tVhXKk-e zC5%|v+-!O}XU)#c%o+36{B$~JSfpYvFINjBSG9}tw81==k}PF&1(#Cig>sRV4qTI# zmr9JJgPV?1gch-^IW{8LO90LlU)o9Ry z$0(mzD)fYFpOaipN0f769q)mGf^WkRjP~_VCJ_XIcO!U11pY{XhWuf$1)kx!;E!?dl7wpAmMoT1isC2(SMrzS0z54H^D#5&m*qe5ea`z z!tsq2{C6ZAKbivnR>E(S@C4W>*bfdNDQ*Z{+`9z@7x!*O!Nolydi{Kb*^8i=8|sp< zT)J%Q3=Tfg;UwBbU#!=O?p8ymP_0y`12Lz{s1DzjiQuGjf64Lmnp>?=mz{?ktVB!J zX%~(=@8tif1f=7VsV`{?FqB{UdWK%e6*lTI7`SIC7_w~hg6ljV-!U}B3x7K&ALF?C zWjQ8q66c~)+93}BhBg0dev;QzrxWwfLR=Pg{wW9|ChoW3db}X^CyU4zIt@W#%e)WO zhImlro&p@drYijt4kUP)t??6vfsyt literal 0 HcmV?d00001 From 67a0aecfa6375e536c7377d7bb4aa1a9b72a0f04 Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Wed, 4 Jan 2023 13:55:14 +0100 Subject: [PATCH 10/16] make clean --- animation.o | Bin 2648 -> 0 bytes animationHandler.o | Bin 2432 -> 0 bytes bucket.o | Bin 1760 -> 0 bytes button.o | Bin 3480 -> 0 bytes game.o | Bin 3744 -> 0 bytes inputHandler.o | Bin 6864 -> 0 bytes isometricMap.o | Bin 8056 -> 0 bytes list.o | Bin 6088 -> 0 bytes main.o | Bin 5312 -> 0 bytes mergeSort.o | Bin 1376 -> 0 bytes spiel | Bin 41272 -> 0 bytes sprite.o | Bin 3672 -> 0 bytes textureatlas.o | Bin 5136 -> 0 bytes uiContainer.o | Bin 3264 -> 0 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 animation.o delete mode 100644 animationHandler.o delete mode 100644 bucket.o delete mode 100644 button.o delete mode 100644 game.o delete mode 100644 inputHandler.o delete mode 100644 isometricMap.o delete mode 100644 list.o delete mode 100644 main.o delete mode 100644 mergeSort.o delete mode 100755 spiel delete mode 100644 sprite.o delete mode 100644 textureatlas.o delete mode 100644 uiContainer.o diff --git a/animation.o b/animation.o deleted file mode 100644 index 75e4a759373d08db7729ffd8a67a6dde7cf7974f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2648 zcmc&#&ubGw6rMD-joNA~9txF`Q>kFrL<-s>vTaDREzy?R926zp)YTS~O-MGKVB1H5eUWy3yeX}#oWD=p^!3UG~=6kd zVAoi4CQ-%)dz-e&O_TMrKKAqU@UM(j`(nNL9^ML*qXDN?OYB>98aq7HH_Z@t5xo0J zNsCyur;V*a^0lVcGYzX2)>Ew=6I~ea_A*wjx<{TptG1&SYglz=z1*%Q$wzi(-!Cl8 z`H&A&O=?+R2wAmx^d(y;lOh(v1c$!9_j|YaCO%egwN+NDQ97!rkWv{<2bw+6OhTb= zGtE?5wYn}$MPaTLH!q?1`GzO&M8{%PK8tN!iW<>zBX-`$aVSZ;Y2bh!qmjCiVO@-E z0}IlCob?q8JYHadwQyjluQ#+w7w#P47?8{ONt_D5>WcUGxD-HB_^tvcN#RHOH=6!C zz)3FR0!x2zB!CFyKY^1Z*5V)Ke&5sni_mWN9!Nc9Q`huLDRt&Qs>uCo$ zt~@$QM3C{9L_vHr$XRcN`)N9$tdny~*boi=khF%g*kAA~grknk=ih*^>jK{(4dL9A z&e1^pJ3$fW909hwTClyO>FiuGc{8z?U7VUuC$g+y=krA+ zG+DL_PQ2{co}=bhoU)fJ7hO*Wr|sp3d@X41pU;z|e;@dQ^+Rw*Rs0P{eY}rs8NVy` zgLoB>hjlrwk@m{IUXfPW$=inKta;41XL~j? za+L}*mWzdgLwp!+(Q^#Ci(?fJT=??`Zq+E2izT9Mof*7>vy#0Ja>WY%O+_djROu(% zBn!H!i=0$!)N#x=CAy?+h@7Jj}QbH(7vLZH&JA0glo)4@ORV8tL9+6)a Uoxd~W?3DjjtUs?Nldb3f0hB(;H~;_u diff --git a/animationHandler.o b/animationHandler.o deleted file mode 100644 index 21f4c0199b4af28ebb7939fd4855839e1427820e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2432 zcmbtV%}*0S6n||IP=PL{AtV^nlYvCmmT&-LWT9!hCXEoJ#u!am$^wOUOWJJ$#?KIq zwHJ=)$+IVp-h_BSZvF`#G--l~G37vv5#O7gX_sY*iN0j!z4^V*c{8*7IGTugJsuF` zfosrM2^4vALspomKnJu#&41x%QZ0W~*S-bS^26%;AS$b5pq8TtYK2C!s+J`ZcNB?f z7|M`}BB>kd_Gh2!`J`4rtuRzAPqbS00jh<>Isf;qn!i)&Uf=y-%PC>b11lXG)%=p$ zUGv}GCJ$z936g^7ovk_lzNW;;6lND1*?w2Qc(jB%t+%;7W@cI?e?g+#qkt@O8G!T+QgL1gf!kJ$a&eVKrK>S7$yZ~E-`EU>gEC!zYli*pAJUwkKt?StQ z^N7y+0<7|kg-b|$TP(v z$c4PMNau4o-9Vj@H+31`c7M^-(o1|jZ*n}HjyqrWTSs1Q&SD6e_$3?^ z^I!eL=u4^WcLJBN$@7bP2_tf@hY=&w5Gif+j{8%6cH(e-A7iK#nBDG+8|Y#?i5Pv& zob^|^e-L$ca@N0yN-}l&w{l>^?u@e2pKhVs`S;R~3Tc|n0CfKJ6&3#C{M~Ys%NvoO p?}NSxXI%U#rt|C(f+2qYDzvZ>4_8MzQF8Nt!Rr^_1L5HG{{u4QO2PmD diff --git a/bucket.o b/bucket.o deleted file mode 100644 index b9b0c0a4afcf74939a3528aaa23aa33fe49dfbb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1760 zcmbtT&1(};5TDIQ8#OhlR0vkep2V*{lG20rAlrl_YY8^k1iVPt#MMgkMe+izP(2ic zkc)qUNB;zGwt7gt_2N}>5dwOVT#5*FX7{~jvu-asF#CS<+xgABee?EJI+yV&3P@An z9*iT&0=)H)v1UOHW*`is$ilCp-uAcnyKrH>-BT8zN=5|$nS-=Lsx?V6C@ z*Fugq18hST2fcj2TC|XIbT9~ZKiW}PIT}T7?vrv{IryF`eEtO4RBA=NUMzR&yrbS_ z%PhW_=vYzWKAP ztH_a)eWgeGV)V5yH8bV=f*C}38_g;JKTo{g`aLH}dy%`DRQavlPjVFbVd`(v;-}Bx zy*KQ)PGwSZ9>YtHeOlj+++}p@R!pYDtuuHicPd*ZXB9|V;C}r%hf+4To?Ok9)-#!n zbfHvOP3F=is2SC2qax~F5i8B;0{ZV0+f>2h{Ah+_W9^+9H_E`;yk)PO61B{#!MM52 zfju#}0j%6^1FJM@HM5Rfy}?a}cVe;4jmnmYpVd38*=jV+7T*D8RWLV8Pg_RK9QXVW zq@tGYha%A$n?a0oRnAUl8IvWjr!o(Gd36kbWedOdNe@*c28@E8o9_FTRV-D5) zSA7DtR5On5G})i(J5BbN>k7V<*qOKHMSA3}AxD47#2vyoFZ3#6r^)k^Tp0nSy7f(= zzataH>efF--fMm_kNJ^S>gD{rdQ+=+a{pqbf9ITso;dgHkb*<;K}!@kOq4riW)XSm NSU* diff --git a/button.o b/button.o deleted file mode 100644 index 0e6eab8b434f7806364131b42a245e47013e02f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3480 zcmbtVUrbw77(b})%pUh>=1kNF2W1)C9<(Mr@QBMy(D{J&r7@cNeW&M?!=?D3UvlpGzTfxv zp6|QoeiZ5p*Ek$Rl7qZTb|r}t()`RWuW?o*4WynFJjecwQT8*<{?{5ECg7G<$b z*1r*Cq5Pc>!FC(%DGL>;)epwBFVJ{1KcXi<=P_|GOXaa4E6+X@a z#}#cWXdzXg6|`+uxRV7s6>S%2gP`pKZO{t$u|OZSLR$ro*DZF<1x&HvIZPvh(V~jU zwxzjPZuQp}9Qhx?>eNcXGjd<(Bj^eSZo5HFM4}^t(MGM%22JEqq)T)h_D#y}QT9Xm zFaTcH41O-aTCqHf%%JUqwaS6A`63+V4x*~5HuLd{c?{4U>slTHWQ#7d0mXGLIssZ< zezOuL5FLWnc(FBKl)fziEpF5kQi9gOlUlKDIGXNgA?P^`Z&{WiD6ODm4I1DLCkH)C zJf!R)U42wT9b)?fbj_6gM6C{L%|SccDVud$gI+e^Ww{{xKFHR~ubaK=`;vT(ue-R; zHcymFq{P8aVjaI zT=kivs-(b~#XA2bg?mqm4~FkRoN}$#SBxg~hry}=OoVz87EHESV@f>^l+>RTK6pV$ ztWjV9N$kNI3d;e~+tc%kuQfJdCJobf&VSb5cBb9rQv218HhioVdWl3+pLZ zy%%Bx%347T(<3#NH{zHZB#s%c<7nL>_cGMc0yr+D0jw+3;9aQcsjqcX2bgeO7uP~u z+@=01Y6~U9RYRKXGPV&gU_R58!LCkfN%M^EIBMtf~G)a~Ju&R88xwdeh=N z%eUU^<>aTd7emR(Ppuk$Xg|p9@y+*>lRUj21jI>d_u=?EXjJOwXAjs>SlCB9wF6KM z?>qq40LS<;F7F*+QGtJo2Mfe|2D=WcTKxA9z~>LZ7XZh+Is7hwc)wx)99FgXHxIyX z9e|Sw(=bv=e}Z&#=6v$9QRc{4Z{Nl4K;PKKaCj&b9g7CK`$A)6Dn2=xN|20^P9~;j zg;!`sPnd=-9LrlU9ls&~WTX0wVWxG`ug5d6qevt!qQs`(ipwBF2C$@8H~Ld%Mjxqg zuaol`4v8eGD@k}WLQe1}&Nd-+u>Qhd3s8sX3*vZ}OZ-J~o`~Z)N_;@zxZ$@i@p;Am zu!7%K@J0oHqTqN}$T+p)Q^LF|enG*XQ|vDvfZtN^BZ|EbcqB|OO5n1_pS!r6<8d1< z=lHq}m-9#bnb|2LJ^{OtF7KBlm)0laeghlphepPUeRl8RvY#K`S=Ib+i24o17g@XiKeEZUZ~y=R diff --git a/game.o b/game.o deleted file mode 100644 index df4b9e15e49b291c1d0c543f5bba0fc5d639a878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3744 zcmbuBO>7%Q6vt=d^gD?YT8T=Hz(Ccyl&qYzNQ5HlB-+H0+$L(`Qw70wHy;q&k-Ziz zBzA-)gyjMj7Y=a9u{Xl4aA?vN$&nCJgg9_;C4-EV$Vdp~1fmW9x1LGHn_WoYNi*~2 zH}l@SnRz>QMho^gC<+szuvgi3Pf*4@N49mpsrp$9Yi1knr~V8Da=(lOvcGzle#FQc zjRtbs+8t7Ay?kgbkb7@|2J+fkAU{v)S3jZp`aV{>3k4=cdGc+brI%1~fA>wxT!FlD zC!`ip>cF`Bx8)6Yo4-+-B-lY4)?~w4ZP+mzcHD-w+c1yBivE+EkQym0)CV8P4SS`z z0Xnz*Cv+4T@zF?eeic0z%F=OEmcv;F;`XFk_boHAZ<&dG6WegN?n8sN%`f&&ocpv} zrjahB?#36TL^i^EgYhoa?vKAjFwmHB1hrzESziG7cNf)JEcskIfx0s@jfFeX)|7sT}vYO zM-R~BiBx@^CuX&mr%?5j9DqZ%Aj~_5;ruLoE+d}VZz&cTm1n;Y3#LD>{|2hTJuW2$ zBp<@;J<9=@gM81kpP5$KZ@gDudw@vU{6#j<*Y~o=8@iT?87WVS}}ypc#x!8EkAI zIMmw{92@HIAJIm~MtgdL+8B$5r>El)Hmct+QVG4sm<}h+*&{QFDMRl|=wU-=!KtKS z(!pdrsvC)^$ffYi4$wClj!o#?)8O@?@zJSiogGDdB$SIyD1Xt9EaVx25aP`!f?p;G zA>M)_c!VIt>Svx3(1t(coE~0EYvJc80SNhVqX_PmxE$x(5~uqW^Ggz^oDlqJp4#MJ z=2so~rw;r(2mZ)``)EOkb=`;qKWzSq*f~Gtz&)mSM(>JQc$YCXc{6H+uc0*(wRTcy z34J=O8b~dsUJn~#rd~@XnVN{#I+1uZs>d)EiyOL%H>)FQgd=b9{zNRL&LrY9dcwE~ z8}g)2j*Taf&Ra|WAH@S>N)hXq?*}6h-+QfBn=5o`PoU7z`cY(A;ZM&B&p-NmPO5m3 z=+7a^DHP)TItiKbn4iDsinU|QOMpW zL+Fj%p5l{5#4p-j3<_PI=d)f2AGFTB0#2{LHGX05;dY`C=P&wiLLr}4`(eJmUrgk! z)t<7@?*0q(F9Ra(neLx{b%ed(c59Pefv>;FH%xC4xwP7oPwU+SF+ZR90d*v?o*%tU PcJ{Y<{Dx#ps@48)%ydq2 diff --git a/inputHandler.o b/inputHandler.o deleted file mode 100644 index d1c4449975906e8160453d916fda03ce41611495..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6864 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 diff --git a/list.o b/list.o deleted file mode 100644 index b0440a79a14a385a239a9aebdc2cbb3ff08b88a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6088 zcmb_gZEPGz8J_bcja!o3HJIkJ?SVpZOLDOrOEi4xK3IE8?bO6R0wL&fKCkUd?~A>? zq=`rfGATMvl>&bVQj5Z`M*N5nMUWp6y|@LtRRkv#Axq?ki;Cpn6x=vSrix_VXLe?9 zZhfmnz$@+U%rnpXG4sANbGq+n{k?5IACux^Uu2D*L>bdN8tn*gM%YHSfh`3d`!Jzb z{-#gf3h9+o^KWdS!Fdq$ingp*@g(N;N{~0FBkg<$@N^_7+i$<=Hbd-ry=vQd`3vB2 zn+xl0i;;G2ee%>YE5ENRgmW!SRmyXuHK$jm)wsC%v$gV8+f`!Oj*(zA2iq5l_5cDW zkUZ|2D(_uIW_)_p0~F9;yF!_1}a3dsSX4LVvEczSNj+GIR_2x2k2zyYx@Zd-`8&GI9q-?o`W*4I|WS zWn@~rf~5q1b}6u{_G#@(MWY$f9Gvc3=q^&XUe&Jn>J@DU00rs**A`Bbr#dYcjYNX9 zC?o~y?WD`*GMw}AFGP#s)t256Upf~#Evx=o-|_2+2@luc*-?Ge6%>-yxWIt!dV zzOu4%j_~DCeXpHxYb{@xrqURs(zq zQ$J&q+BF|Bs2*4~vU76T7dX4p1}29v^&O2irgoTHU2K4nP@}EWEN#La0vE^hK)xoU z8mI^M%p8jg@^oY;Vz7I`hK1M;3OXVH6%PULxH)16r#5HaVEv|HmVDH zT!&jx^>B4LdfV<_579e%f2GcS`lC!W^nOkqEE}Ra_Nk`1;g&)DVQz?A`dT<~9}4SK z1^qr09#9oFE3Vfl0}__kVq-USh@mRKt+26XNRRyf$v#b|Wb{;#bHtSls+2js@@Hif zr{R2c5VtmFPshU)%5aO_=V!nyodL6S1{}OgX8>IxtYj<~<_qtC% z-4*WY33oqf$}1Q!*O(zidsD4{iAC_sq(+2cETfcahw`nIoM*M5%bY6p$sf%M^} zZ4AED7T@r|X(CV;W1k03@*G}rye-BF7(Wc0@Atq*Jn$cQ z;4GUdS>ZJ6r%&88QkJp5Flw-5U;p#5Xn*qg-rgZ?I5`}R^=nC%OJ%bKn>%P`@>Xxb zJf1Q~S+Q)DxP@o)CBw9O%|hN%`mt2{1<}pe_?OJo@n|+XR5UY|QDV=Q3OU0vGwFd; zanLLrHPROAGpwPsX&Cu~nNe$^(bbL2_=Lq^!B!tG94wgGQI<@WEOL}gPrQ&EOJ%a$ zV>E3ke#mC8naUZ%nViACN?r=))BQ$%oa~F<{(?!9%$#(FhtjF6(~0KCsT0j-aw#iQ z$j2vA`EkSPGCQ6`agqgN_#p=4d8Q{N_a<-aw&bC5lDEgaTua zP@O?gmh0)ETZan`al!UkOOM2l+A!yDRPdJsF8RXDO4WmZNx>gd>>Q9h4~c#3 zj`Na&f0T4&oUbc5?ktJ_L%~)4T?PM`!Vin18h%y&UIka}M-^PPQ&Mo%P8fzs@IfwQ zoQD(~XRgG*rQll?{Di4!uHfHQaNLQK|1Sl9RKXtEa_+$d5hvzjX0KoXyxDJ@|ij@plUT zI&tN?A;dPksQMww()u<6b{K}_d=R5A9NYr$My R_OOS3UBqv}m?Ccd{{Szbck}=N diff --git a/main.o b/main.o deleted file mode 100644 index 9045b7a78225968a8b9f009ce68d5c151b694274..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5312 zcmbuDdu$xV8NlaqZsJf98wigU8a6;6QJR&5CS~m~Xw^R|At5zF{DH(n;i1HFjAKM35-Fe{(l%5DB?O^BlnPL#>-WvW z{=B(WCHN%Y%>3q?`5rSnJL}(Decj748Kxz}wz9>Rrchq7SZ^2AcGkjHvkNV2zZu?9!gb{~U5lixJ8JaYk@iKp$UHBSLy_7u3q zSgmQ9{b%K_ojJC(F8w;&4EF7*dr?Ig65gKu8m73Eo&%j>IR| z*Xyjlim{6!{pNwfxaVqmb`9 zL!-~d)=}YiE}j)-SIs)w6@L=X9DrWflpum1xB+T(P2-tEpWm1{cKn;zIyGm_*Z0Ge z^;&)&jJylW$3$chpfxYXFQ|7-?fiNv*<_sptMhN5g|7Ht@f$KBG#+!klK&XX=X$s0t!+aF+ulFeyM5b$!TOzQ$V-e}CdAm` z21eN_aL?ebXN(7aVT@Ot$PJ5S9vc0!z0T-zxiL@-IQKU9b{P+?FFj(oVPtr2u^bsC zKH_>V4WPQ9eUuYjx|>%Q{yr@A+ePvMKvv7W71C$`39_6Z@*(s5{&EL%FO^8aWjSAmBM$V z@IngrQ~2%_j<1qNe*P(i|1E{Tn!=}3`0*6}aSH!3g@2pESHMPW6xTH=d~FKfn8NQ& z;oT{GFoo|-;cg0lI)y)Hh9viPlA?t&~GgpjqV`Bs3fgACVb&hc-=x~aUjs||!E3pnf>Uv#)0|)u2Y~=kC zzrBm~hJJ-dfm_TwibyahB&!SPl3f-z9rQg=A-FyyQfj z0Gdv;N4p>)UNpkw0t}S>>R73B%nv!F2!7SN;8`UF&V6xO!uwFjI>qr_a5?;GzKL)= z(=@-E@YRHO5Z*#~AL01?>3JR?9IxP-M=AU@#kK!0sP>^0elo%JiT`)SF<#7xwu|Qp zik|-}*<=?~nbcni&kG82)YbE}5svRv&3{2SeoAOQLija=|Az2u3I848*Af0K;Xfh# zFNFV;@V5xRp73eH@x8D8e4p^25q^U3wS@nJ@EZxg850bGd87H+Kse3MgM`!kxP;UE zc!bmZJV&?zwsl;8C7j0lI^pYx{*2;S;9W}JjgAogn~45@2sa4F&oLCt1GT$R@#Op_ z(Z{=l_CH7XErjO@Ur+c>!s$NYgj0Va!s)tC5Kh;9l5o22FDkC%LSIo{CHl8QTgNp^ z_-%xrAbbPi`=E}3^W)!p*Z_G+77P3%)qXj_^>dE*78E_tDz%TrcLU|90Ah&WMSay| z%nTF+ye#AkGKgJ_RV1gZ#&f< z^{OU(dyK<3#Dp5i%fll9ynPq!|GN&7#C4xID*j=vMe;+$%kp(bU6vj4UQ zs?`2#yag(a;y;fsN042z5b@(VqQ~p_w*o`^ZAwoU|5o-fJ}NqXUG_kyu2a2MG}b_p zy7--eUp>kA^>`yOhxT7%{O-UxljGZz{dTRW%H;T818fRxTlqhMlMzXd{~r*xA$|Y= diff --git a/mergeSort.o b/mergeSort.o deleted file mode 100644 index 84c8b38d95d81d7c03e6a07d9a40100b8de13939..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1376 zcmbtTPfHs?6n~qIf2(a2LBUeusVy`^A_~@n1VS`I^$-bok-AC81nO>NcNSF8dJ=N; zBluASFMb4%Uc6iCA@ow;+nq@!W4zP{Z{B;q_kQ!{?aclvep^jg7AUb`1-g+!0d^Bz zKOeby7=t(P=iP_Dl~U`z)H-Rm!pDo9Ygj83meZdq)zA}R`YT&t*-S2sqTK0xmSq=M z?sJUeK1tLR>HzB6W(Ba#6=60i$y98>Ixd5Cn6hTahK4WjfbS6}C7Gn9_%?N(D2xxT zV*$l42+fv+-~alh?Y@)KS+wCbqTM;A2BK?6)AV8#*)aGVjPRisaQYIxGLGS-cFt&a zDsj1A=UYu*uo`SAA0SOR6q=xC3Kkr>!l?oagdf|6@&rE=z}at|@D zDLBJx$^^ox{giRt3)z9+Jm9`K0_O95hw;YuJ>PM8)cRG+EVAj&%rBRhyLRT6G1cla zhXG;gJ*iw-Ifga)A2Cnw>3{iOkV|`JQFT%MDX)v_uk0cwm9N*G>Vf8)wMER)>*~3C zjL%R>($U&o%ztMGQ?#eazm$|EX_Ybg+nAtNoL2?X-pPZ`$an-Tom24@-mf=NZfQYz nhz*RQr9DhOVdmWtVR9h3hAg#A`# diff --git a/spiel b/spiel deleted file mode 100755 index 63354e10b112e6f09d314e7c1f091d27bddf4bd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41272 zcmeHweSB2ang2}!5*0FoMMXs&6%|loKv3|dO+p54Y6206pn}7YOp=jgCOeto#eznM zSZ;@C`r?+Zw9W3%cG<43w4z0ek|2_3(T!cSsl^&y+TIwdF?HaP)ZCucq1gmJ2?6SR&|UNO{n+S3oSw+u!0+Ew+z)z{3rs=j)9eJ~VTKYjh2Yo=c_ zE59k6Ka;6IdQl$KrWP!$r0VD(n5<5UPY`Ls_h0zlt4ChQS#ZNmpM3a}?;XABPwqv{ zQU>KoH1rU^tYS)2d{I0+=Me{eZgh~d*&*M* zIKatWXR?2(1N{OAeI9V2KgR*S(Lqj^1O1&2@J}4{f6Re?t^@p#1AK*pp1*d;*K~j{ za*%Ve1H8#W&VvqcmxG*r4)jks!2iv`4(~g_UvZH0TL=1O4)k&8e=%?)9{AUYe*=EW zr_P#Lp!s~Y4dIZlDe8|zeLl@sy0qL^9f$;KgH6#uWNG=l`fw<))W5nuz;PKd#UKxr zhpPiKOSF0Q0e_^}U$v$-5{`wcwFQA_c{tV-s0cR&qrq@U^MnM zNqAjID+~Lpmj>2HW0Ao8NVuW2!CxEDh-`kv60JPoZvukwDj|uUAMrN?mIfOF+AV>q zXgD&nC{znoOPg4p#j$8K99kTJN=<=kNwTEM4-!FN76{cw>ntsoTd`YFl5kUCSuj)` zUPsU+Rgpj-qz8hvby238&^JA^ib$Y|@?u4k31%NzXp~==ij{JHeXvmvM}l{SLs5Ud zrU$D7^J0;va3q!IvS2k-EDZ&tLYpOl=u&^A7R85kL_rpYBMtug;9UV`qLcv_!!CYi z6wbV)E*z_`W@Tfgu<&KUP@pNjFsy1wZ)SS5nks5G*Jw?RkzgoVqcue%p{m9WT4OBQ zgqDOxRJF!eRky}h;}6yow5rY@(V$j+xQd9Y{85lqt@rzCf+4P~&qrcK`)lwALs|{Y ztSu-jEuQC_nLo>l&CH)otr-oQJ!+V3K?x->skjP}bA@ym6Ulx!JPT58L{!daCIo}y zi1R-LEOu`2RLbcIAx6$K<@~PwGA?nsm`6(ZDgn=J<9G>|>0WY3cxcW+^A!2?De$op zh|pBvQddF`D)28T^ur3A<~Q$}{J)EZqPqUzy94c_JWMJ5C1&)ffo*o6BXF)ZsSAn|} zc%K3vufRxq4#si(yUETRNiI$sRqvKlgbiEIGS4q-jIROXneQU8oU# z9btz0-%cizZ7fY2bwmBHT4~y#8|v@0(zG!*)c<2EO&f|s{r_sEX@hR4|LazoHs*%< z@3qpj=`_^;Pga^X;)eSDR+={8hWc-|(zNk5)L&$!X~S)(e}x$lybbk_ zx6*kmon@t6Ed9YJvb?mxiSk=%+Hgbptu$@4q5M{wHa<~)D@_}2D8H4ajW(3uO49}# z%5SA^-zNJIIpG;N@v{8pMa&QN|UO&ew?zm=wqGL+v+(+1g4f0mV| zjj^Hr5B?&{?_ue;tu$?fq5M{wHo#DRD@_|;D8H4a4KI}6O4CLc%5SA^-z&_emGG;L&|{8pMauuy(0O&eDzzf7Yw|D~QFKugrMC3>w)B~5dd440jaTo`jd%3;k->_kWv!!cnGaXqI_@nm1vhr0`6tgD3ToQ% zHYCphuiiTP3<~BBN6&=o{|#{D`cF;vxh`x5x%RvWLElfv*4gh+F!dAN7}Pu8`;y){ zoTFzQ&|m!|IspQHAOz$l`)XLflKeD2G~Y;QEp|nv9>4KEit5I1qhs~NjrSvA22UiD zW;LAcfzg|g&RPjxD}UneUk4;bD#2H@bP2|*0=@Oj(o#)(t_NeyUb=;24nfRrQr$d` z4Qbu*_K8$6OPS`q@Mn8(AcA%91pOh5O6K{1)#$Ff_vs05pPp#m0d$QkwC|W}e4*P+ zg3gZBJ3sbF3Y6U2muT(*Q+#-o>#N70jM1UDPG|vyY`hRECProJ+n{bS;(Auk7n5AC z{#@h_>$d4o8wxw>(RZrp;=zsRi{^WElm zQDO}K9+_DWh7PmalEUmmN=(BLE@^&{E8>YZmI=2c8DBSEC*rFyKAKmfdg7+Gf_IF<;7^@PlR#@j2^DsKBFgP2!kB62`vjJFk8r!Ti64V3e)Y8 zt0$Jjt>x*)9cU8V9tX_XLeGJ!oyljYyKOnda>I{C9fh(emRazW$f6QiEKbkjG(B;f zmBnJWaf{p7N5<&+qh*Yh!!KHG8HI*(-9*)gKQ!Miv-%p=7g>@Dkf2sPtQ!@%ZE1Xk z;OjMFhm6V|qx|6BIndU81D+pUU{LS!nn-K$O^32#ycdkFAXkj;F)$5KEtUtVy?VT3 z3WJ@M@E&3vw5M2h&`*v-7IP6@<_g?u0UfD12#Y`)5{jtCY|K;~Bo#T7bvUa(ebj60 zLnq1VLC2!5Imiak6lJRCams_~loP<_?U8(wD0NV#JQV3Fq%{LHp(r^47G;i>?0Fiq zXC>4tE+Cqe5vj>dsd2pyI~bdK%;~5i8qqt@ovHVdi&)X^n!;R$Y34~ZrZ+UoGm^s! z$x%q}g@90p8G{l`6pYsUgtq$#wJK#mE>H(#%IYZEY=_a=`KJqKbQ}AozC8FYNzYnsb|O)C||TBRB`=SZ|#DrjSo zoTzcV-{HE-JG}N<%9)Zcx~}SsOr_K?e#XtlfZUMVu!nwQ(O$VpxPSJF82pTh&6Yr>?24X&O zELBGk;N49hlhLbLT%XL@+=U*r8tN^O;Vztn#2^wqMSLhl zcUX=IS653tig7BmNyYl#!(g0X2%3^kcmY_ASTQf9e%^u^*#1u?!60k(dFtvYL`x&` zaTW^q)>@GR$@;#|;cUqh1rL;Gya>m=_C?V=&>LFTf4abCa(i6Rtu0*83K0_bMsSmD z^wtU*`pHH*eEBqna7}sjm}|MTosL0z8p{sA&Qux3DuzMT!bIip5ijY+E97iWU1_Qjxg4@r52H z?;*;lf0hExWsIiP57oDM>-%gPcL&QtYw3tB zHP8AWL*pD}CITNMDqbFH8(M6uC(k8q2z$1r)-Dr&&lR@BTcmonzwa` zm52WJ$jCLM$Wqf2>V%U1xS$bhgX3fYQV7E{TN^-L z`r6oSH!)h1n;p2=BB*bG7UuCqcC4tO4F5 zS8?lhkVOse&VDaX??gI5YZ}+)%Tf@`(uf(^uwIE)GTysQrqF=Kd$*?=jqF5hrQccs zS1Oy6g|Yfkdj=%+qs(kpS9*kZ5AU|MdFVn5=b&6Syqio8tP}9<41Nv4CllO9{h*x; zxQ%Q~Oy>}C3?YjN`3NDmOXP`bfqb_g$V*X5vI*lwK?}*LOTcylc(4HGFlO+YASk(*@*}So@1_C%TGWe z(H62c#S@rq>|H_(b0tGtW`^aRDF*D2Yi6!w@MU1grQRYLa`zSy!!KbkY!qB#=4WPD zkz!ERJ2X{aZ)|#0oseOnzju&C9x=(Qc)Rt)%5J^Y+l&p#PMY*%yfcs+6lliyvPCy? zbYn?w!rNxdb1Sqz6tpYTXy;+1S~7_dV~n)~e^U?_q!VNOSyI4==ODXozD0GMw|=Ck zJ<3#~Vib`WZPbD(mSD>!0H|#;fEYV~62nCg=jgKt_&`Afyg}OuDjzl4Oi9gp5hit= zeK0_m`Q-1Jxq7<1yFj6dU|=@OnyJcZ6P3I4s$b}>V_zdOSg=QLoiv^#G%*P|aqq4y z&O~F~T<@-pd%C>4iMY$VhXRhIaw^k2gXYMxXx4<$@a`A9{bOM^A)vn>yn8+PF_XVz zTK9stw@bskh3d5zqrbuIiP#>#{zU9iqhf5LydzP$KM~slhXa*|Ap>os4@|7_k4ktS zbv^FwK*vR|NHsdD8zRv7DCX@oD$rI0PYOmuL?4-AH>pJ{Y2yH&t~`tbDcA~t;)%#Q z(_9*=l3_dF!7e$Cg`mxjd-n)iQq|7&?s07$g)+vyyVFd(+qLy=cm*(_wWC6eHtrB9 zSx%cQW7#$sHd$O$NAdmZZHq!<(@`U48kI+k^1i*fWY{167KB*aC%i{tkR!BKHz_g| zn=LfrA+KS$6piEiB)-pDr4zQ0?56H(h|M|jMF;Uy-i>WK64lF_v{mnv0}+`VN3B_D zD-uhi9+Ytx!lSs$A&?K+2PGJ;%w3Lp;#Rg>LS;j9Ab2h>%&lIcBY5Gc zHf6z1J6~|(M&)6nyq7dSR0fv@9`9jFL7i!|At6hGHp|L1ZXMI$jx@!WbJQvYWqEz5 z;Vws&aZ?RLmp(vfFmRV+&CS7xxXTaWXS9bGkZeRtay~a9VGKf5PsNkyk!2!{kKm^q zxs0zwQQTA>OrpKV6PVtpD@~KHG94mcb&yy7lHaNSpp-umqYhD$iOCqw?T_ zG``h8cb}{E*IX!Qa~)}!s{<|Bjma$>g<0d4b}N}n$*&_RL|D5LqOIr&>Hlcq%!e)3 zikQ!)`70mw*cJx2-u!=rsDUrU8%|`!H=V%Zc>w;H4SI_C_^fQ$h#fa72aWQhC0ND4 zf2K9}VcFdI;CXyglOqKm5(YQj9N%p(49L89__T7ybp15|Bb*w!}O z1LH7@eSJCxfugrC)l}zOWv$yMYdy!3*bk%k3-$Qe$y(Xm!?E`P*fJUbFEfgl6Bn&3>BwJ7LgGrf^ zOKZLLA)?~@Cm>>P+HJ%_zG7g5X5%cQ1qIV^IaF!3Z|KRXwqO3&q1t;?I)0+J@7*nBG+6__L%61F;A|8N{;w$@0D%`&FW8rqm@g zS1kjQ_1qT9J|i!o4TkP&*-on9N!3U{{Ue1$3#n!>bpQLnCz$$1%Qk@fX)`iC+r&du zp=o_xx`c;_B@L5!h;mH_u`vdFk!nHzUZL0ooS0y~0WQ$^)(d^eHO|smaaNG51PiWb zW_E3zN>g7}WFSbz>zR>UTa$3Man@w9dr1X7)%Cy|Y(gy6-N`Hh|J1S@=&qKX_yx#n z-ZYoEfUuL@TiC=J31MxSMCf$12kJ)LA=n7mfT7WkM;#Nz^V!kdmz(V zDKEmUOvCYAX=?9;D@w-^AGZf^*jELTP#&r7xiGZn@uAu3p%lVFmc4q7Jeko5337)#gwqeebb})WBDUq<9 z4|`~TXYWMhWB&P<=KwCxXjBpv(;DWKr%ofvb-e!3)uXXbFil6Ay!(!{hR( z7+{K4U!#pn!6PzX56A`aL2qMnm7*clMx9+=8mh>qk6HVRlaionm% z{Tt*xKBw+cE;dc~S*fhpJ`ObfOy#fSJSe=d3QseBr8L}P>H53(QuUf2yk=>QDyIsU zwQseAwAyb(mF>X#vK`CtZPm(c8Fs4a-N73LF0!!s8IG|HBo=p#1r1JxO2{<@#H*)HMxj@QBfO4!ZJJ+sIpyb2L_Y-t}3d+2`x0|2^3Y2KQ z2MKzvfTG=OLkUou%*(v<23iBlk@a9)(cjbq$G#5TvJLRG{o{`g+4hes&@^_N?aW^8 zafKJtP|5c}Py#x?Yqo||?7ZRL8=n5};V>@lJxF^~Xb;%#$5}Ldev%&?5r~RDNuUv@ zqVdgx!4!}kWeQ>)rQ`&3=rPETfj<5P)v3F@$8}Zr+IfO8b>9Q5?v%9RNoacV&X)@J z5PU-aYOb6R{nr1aPMA=eZmKV~LBw-zQ_-nBs2Hey3&6HZWS&%JDh5Bd;pO54?6{6P z#;|PW*g`?~76pBY=UGpA;{J)@Jp>_q|7DjaRUd%f<~=loeW`x~bO`1ea^2QJVu^nA zLjYnE<4|N8sc^`3)#$GR5|NdFI(ZJYrjf&b?hMr7VvOC45<0PSBjOvqOiEGtXr(}W z_Y>c_8Tl^B#0NIUw~+YWL1JWn?_VgiR`WwmF}|~i??*_G*{E!5FPCNe8TcYJ%8;F@ zY*>^so_BD;VPL~Zh6n5nV+6yGi9sL9;I}iJA{d&9;cO*qx{FHYsRcrUkvyAsOWqK0 zOHH5>Y_!@fX64BD7u=h&D*+uxnPVq^DJjrW`owAJiuV|nyrG$>pi!F(pT;gFPvmLl z18}u#Q!jkLGTfz1Ti9d#p0bygSmtB@&4sbe3-dd)sAqGE``W2EY(#FR=+kfG=NYK?Dh=VoBAbf9NS^J8DLacI~{d$ zJB+Mshmm3IFluggm`8!Z%fNk-TLo2HdwOXwfJbW zVvPM)ql*iX{eME!>hdzV{dB^N+b}cl&d0C!o+}8m9e__4Q4A3S8jw@Zqe_ zD)6_!rO;=87JW6NKN2^y=6d@+UlucX7L4U{YV`?@MC0BgG$*i1oN5w$3zi)(&c#Oi z*0X6P@9q0^>K;@aRCaBB6Yn0#M&x?nd89-`8n{EWqJd)3ga$5C6-b#JqL`CjCe++b zZyVr}d{zha+4ytPMFsV3d|YOD_xAKYFi`e6vpS07f15=xQYEAjHg?(!z>uQM8y{xH z7;&u=3jl1%n}aV>$6`w^EajLt!pecaQb7f!bx^#cfJUVOnQmpSX;>Fmff;chbNlMi z9UZmnm=pHW<$86gz%JIW?A2Rwd7*XoO%u5}FaJ4t5xUQS8(i{)y@Q>wV{mF+K0(k= z7xW*!{68{%mz=Zi>ce7~-ob}qqAHOa(I zbsZeJy(GK+_z#HDrmNQJ&x9ju0+FlM`H^os)<-*VCbF}B&2;!Arc(`D6#&=)X&OT6 z%M?;gfvA@P5W%tGcN@Kt@-F~CoZlF#J>dO5woB;JBBNzj5h>PRh&e;zAws}D+hEVh zc##ve#d0)%(oOKncHlaM1^%0ZKx%>ZaL~gF=sy5Tuw1^=`R@6+pw>5LDz>fY-ede( z`qg4#j@L)*lF;bXQpYr!l&!b66tXBzZFv=Zky>1WLlY0_gcQ}?Qh@|&d@uDV^O`Q? z#fqHO|1$g>&o|rELU)0oDz0Z(GOr_<1VS@?1$=*%YIxHj8EZ?%wj^Urz)A?9ml{4@ zNo;HEITLCwI*?NHGE2=-8P)tIGc;H8^1oNjr;zdIQu9nwbH@uQHSeLZk=5cU8Pz;W z1`yV4MlOGsHC>-q&Cmp>nWd;n{ei1FCRYDf>5ys|uTt)xqp`iX-!jiY)!&#`;B)4+ z5_uhf6F7iA9)FfD7hfKm3wyWgPg}m^XWW;>8gwI9H}JB_)A(njfkY$KNgAKjF^aF)wD1Ic)dN_8#Nr_t515e;hun{gX4^=W^GZ6y zK~xjmlu1GVgZP0<#j7LS0ktAc!wZfY7u|Dem-jfWt_H>+LQ~o1GBMy&Fn|u zsoB*QIVQbJP1ie^8}}Z~!olVB-s2mer)dJ*nRTYyYq8)qjEVW8dA93;T9i;-zhH0@ zTVU_)L;2(gXe}?&Hbc|4z&t3r*hhUrWo0v9HwKh6*3Z~S#Z3)x^pW5C4m1>cVA?|$ z<}Q{n_1RQ8=x6_ny;WNh=4 z%b?7NlR&uxr5s4C(Ar@?)xJT=L=ZVd$x^!0_bZvz>0%2gn7Qs8x!?K^Fc-C2u0yK8 zFxPDdIi^lpTJZzZ{066Z9my-pAk7;80O7!(D|F(EG?da`&llVtOT^$!!`ozuQR;gT2$E zPo$ebJTbnIme089<1PgBwvHNXEZv9yg3**cKs$27IJ3dtU+gT3vkiTIpOKY%fL5du zs@fv6Cf18^jMTYQ>b)uP0v)beaAn+cy~m?W8C-$j4H>F*ncpTyGSVSX)8rQnzxSN5 zHXM%@T}sjvuR^VXw{!J~#e`MZt#XRcb^7Jq;A4rA798+lPX_OKEa9SMour-Ku<0$o zameq9;$BN`R!?W&XquhT>mg&)@7=Mw85qsHwo*D+5*A6f6Zw7=0$tIl>@~^{;ZjP^ z-i_4I{@=5*p_QYuVsHwl=n1^}ZDi@j&AEyBZUe7?CnRn@D)p90x>1B1vNumk%%5x& zO;)f|fJIhCQ-Cc<%%5Wv%~7y709yj=4ZxNp=9d{oWmGPhk2)iT{3;=~GxQ2F6zywJ zWk?be7kzBE2bs|c&u)T(V8oSuvK>j%mrIc=@WLYvUDP~V^;HOaafMSi{@Xl-+5uI5 zVHCDu-3B);jf(XIOgAx%IcO&>T#o_Z0ze0?m;c$jmV>Dsp*E#n_`fWm4rqSL+owzE z1y?jJ{`P5wc-^(qOe~IKK!oK`XH|Fy=_On$#i^$VhJc%>8*l50nR?Y-7ez*H=UZ7YvZ z3X9HF&rK$~LH2oQSGKxxSK>%$1>S?gj^&jd%&WEDwF<8?K21#QJ$3V2cncT*jKcQX zH;w${r;rPLPBcE86QjK`iuX@LXEMM0GkyR>KxnF0;Kamr|6d^1ypN+`L58YeEenjS zVUAb`;U-(WV-y`>u=hRoF*#3?oUcJMg32tGG88Rr%rHk;Suh9k=~?8aWwG{_y^y1s z{|sGmK^~oqwL!L1#EUsV10^qec1+@FJ|@6y=Y!g{uT}|1|1%Vlxb1ptjF!OdeE08Zx}AvspHU*R$@?=? zyA1{1g0|Jh=U-d83fBvh09sDRVb(Qi69rA#L+O}kZfqzfhly*D$OqG277Ua_yqTyx zLA#xaQ9absmtjXL9SYl16QwuYRNB;DK26%=-Vof49wanF6-V=?G92 zh|G76l=Oy_RJ5$D^~ShI(~52>HC`{OEHyqXT3TeBsMK4hM*&_^HuW#$LQK~#l%Vr3 zInfJe{962fmoj6h%y_TF_qyY|?N0KUBv3`C;&9=)NVu_ix1-%}HLeotK>;#nOa zNx^Dpge}~Qc&?=9{-=`3SMYZPe;?!Tk3Z$xuAJhu)0W_aFwwxgNWdQrcp8FHPmRBx zL`6JMV9KS{Q$7AzO>H0&tAXzLP7s50eO3q7_(P%SMHh+ePNS{PMX~6jnqvBXP*X{u zDT1{yuSQE@!NMz_^$>3T2zQH_5r`EQ`5d$ ztZ8o-Yt84+Lwq0N`w+(v(flP*v?}&dq5RrljVvsO_|Wu1418&|R)dcbHKM`&%XjE` z5&E?i3I5gWTS}@)IK)>MUW@NVr5Q_L8u_=77|*mvjBjEKQq@(oB8~ zZ3^+@k0+C3v+>QFoyp{6g!_MzOdbUMu_uzr8<74c+FLckAm$WX5c)8Uc@*Kd5gtT% z7?Yr*2!Dzxw>t;lzrpml0O9ws0a=0YtJuGdB0Px0jBN<7#nH-cgmnj#$zFsv;B0mn z;U969JaH6s>q#c(Ap8j7a)kHvCX*Wx9zeJq;rL%AlY0=pjPNkR);E&L6A1SsoP-U% zw+=&Zggv;QzXIU{zr)NE;Sj<{5I*z!WU?FKK^$-%Mc9V-zQ^KxrVHVf2=j0op$y@T zxH(miFf^D*m|0%m%54JVVc5bj5~6d}DVz8xVpqS=#m*J3Sey*ul? zv14-EP(K8pgulU^$>dc;Q8LC&!DRf+!rz?#OeX1n#c6r&`FRt+>^gm2ZnO5KbFZ6r z_2i2IW&A4;_MsgxMgrm?xl#P}0^ULV;vuUHH5F$z<|%=xL)nkOexT>BZl#$e$s!XuR>9Y?BM3veC@+Khgf?s5Ide zeiGzA4?Ml2ZOO>FfwEwF+yJ<_JDH@{b}T&Q@p4KAz3=^fv~BvHo<);Wz+{jP&4BMl zTYsENC(E4k!(5q1JMash$3g&T3!nWK&j26~{^(zfoQ{oluWC2wk#jA#8s%ex=1TMx z{2xn2&T1xy@VTgqb->R6ot00{6id%3z;D5k&Y?8^pIiL&UCbMBGWARv|Bo&HI^bVN zAN^7q{u&Fv1^5rqclV{qf11hn0Ja18Z=+9dL7TSp^P`M+jIneefAMGB2V0=ZxSOF_ zTP8np@u6h$CKaDuZ1InU{mOyglZJo7!e0q|KkyxC_@7$%GT;r|3B>#4DIG(p{Of_I zJA>yz533A0XJiuv)xlQaAO2-B`2oTd-ei?X{o_%<>wk@ZfCs-~;i;Z?j^>#FOmYr^ zE*t;TuNrZSF8g*y;{k}yBjy9&t>UTOKEuTj4f)D9tQr6evA)k`mM3_ zI{|$DyUFC&((w0Mc=Gq#fS;w}IXkm6jRTJY@8mydeAo~CZ&d#5*DU!PfxmA6HdgVa z49(VYh<19ccEJ7Vxg>;W=!0~>z}U1@rOCO8 z>+*Ake;zT-~$8V^bh&y znN!b0`HeXFT|>O2!X7rbB6hAw%kLXf{nI1yAAXVyQ@Wje6dq~I^@0E<1H_iF! z*(>y8Z3O9w46123uTOh~SZ&n<94y#05Be%S6L_G}FhCD(fUu`c6kNi4L`G8Y4naqo zU-ZcQFW^b5eApIZ<%4}0D^A{cd4)Wjh)6u+L~~;4IRcMq6-&!<2=V{0!1`{vO=5wE z0}4f0A;MK6Y!qR$2-`&1F2bE6>=0p(2>V1hC_?QbjXiD=dPG zCqka<=l_-8{ai3_-gTZSm8)Z+Xv{M=e^!3M^cgXhnsN8cg8YJ6`7@?+_-D(`L9d^f zp<(4<&tXnRc#gI_BYc#$F(Z7m)vr};axh59{+tdUqse}s4$swOe@KU)sr_%xciUa(A9pJ}ck2A7I`uX=A z=tp53%~X$PFt}TL>Nc)ETSp^$seoVoMGlwsGS@*)xdWW`5~$v9pU&m5H7KI@33#`U z!}s$*`?i2rW9OG1@;mfACg5)bd77>95Pey|-@BE=yLq7XF}O%5!MlQf#yk$(Cvam~ z`&0-;bb@HNcUEzL91f=n_@QbJXKQCfX9@U=WgOnY18p9Ii-Zy^1l*&fW%N$K$5V}o z@fu0?Y;cfcIKUrfaJTk^=x}U*50Z8WxKYmKvb_&Pe+;;XgVKI~4!ApmpXp_C(nwk2 z9U*_;O&liz?U)1oXa_%YF5nlB6t7+5Kws?1J&-(Jn(vfV!5 zAZHukyMsKRL)b zWel(1qXnFv?T;fmp20ax{rxBSZPI_DZ615MkkcXhBinlg<8=c58{vPxCWL+2LB3DW ze^dBdb|wHGI)kBhSSQ-^EFtGB4su!@;NKH+;@5EjY%d?t#|3c(uRYR~-#UntcA)daWwl&{!X!ljb=E*UZRF;2G&PobfRDHZ$i=^3er`BFv+vxDN(CqcpHPb8v>Eqz>+ZT z7gTBD%(zO61?l`3%CKyGzWIxb%Dq1C!V;ekMOd(~(&yC$P%l}m`4*HdDlRJXEt)@n ziFc`QX;E>Rmk86!SDg-Miuxl_%~x{k!lLrhdD@!5hSgzzq`H(!tQAS+=acRDJq4{Y zrBo>lw*VLgl;SB3HQ~C%{0K^bEbD`-t9(^WF;*|CjLODp+nmMa?n}9mrRA`FD6rIz+di7FbP=ktIvDb? zn?dvH1O5o{*GA}K34B8!kZvxhz8IFqDjSZaiB$o2T?9Q~!LGOamVTILAO`=9sD{v)%Mpvs^r)1qm9nwbWQ(ezMfLUE zkWI4OMXYr-kk{Z2H_e4C#(gS3-D9KXM+ztctXkt8n(8D})wm(019>N&n{e9}$Kn92 z3hOD(sswkLtm>}_Hw9_HN;9xk4%MsMYM?ya6s^QPC{|zKM!hq^z5sO%*1@eVRfaJQ zRReD)TXH$digA;YnjWkUa91LHGA||ftV^P()^us4I~$^w1{=^@A(i(cG8$zGe;EvM zXD#}r$hC+@X;wBZziC55)V~^GG{VC=8AJCCL>jgHP&gXMuMNfW;Sy2I=mrI}Iu@+2 zo*t|gprYc^=}~{J#>ngZO?6s+^@b3#;9)evF}MQOM5bnBBH;rr5~%kRgNQZON45MQ zb(nla^J~K*(iEuD@}p$2e46fnI?PO+AE*-(oVsdAlPNBP&vZD4j3X<5LlD9^JKDXL zk6Bg&W=?#D_xJtMPB)ei*dyf6MC@nKBSU!(%AuTA#wol6f0#;J{Bs1q3_ZZ952l-G z&oxM?{L2Nu3@4{i(_U=)Q)=Uv=Q}d=q?3=}Uj{s`j)i6U<@v4*W&T*MvB$2zAJEhB zC;8=hkqmbVg{h2WXUQ+mVQKq`iY)o%xsnX!`7ub?Lo(FopOB!lS;;TYpJZ4qh^79L zPKI{_PiMU{-A;wUBSWzaWp$+L=v5D_Y(c-XIIKgki|I1<0x@u%{8JRBuMcGr)C*soi}W%%z%tNil3 zO@@+AijZj;?zHh+=W^7s@N`JS@+8)>{E^|)NUHhE{cst^<_iWJpM>tU@yq)XG8`uf zMQFF*3xeNLvr!O=@Xr>4!=>JWN_*MHFV78SxQhy>Jofx)-Ag1g8+pDcL+iqXkRjWT z6!}|3=&Vk-9qSyjVk4)p)629BKLD9a;g{!?%ReVSy>dovSLQFzHCG9KSupY+^vHar z9sd(BD!;`q?vJdZj*X|?WMvvShbgFCH~IyNL?}|lABxUdoIg|wT12Sl+%L)NTY@kT+}v|N z_k6qOo^v00SMO@C3j~Ow0C|B_RthC#achN-b2d&I$ab+w@gx3UtA4G;t^!18xOhh`ql7(+12owo2%g+`jQf8tO$hI z)Xm=>50t)L^Ge=90e7?stm$`F!w11cL|+1?)O7{T6lX!8)E~BHD4SWvV7UN*C`m(Q zkKBNQw<%bdk4G<0I&UOCTfeamlw?1T&m`E7Nw&0|kadz^w}IUUJCFlHW?{{ZttP_< zC%HEWXAR?|E)79ua5PbNm%0J!z8s=#Gi9ejZX&|kBT4pCl1=kK>DX=UUgo-RIzGb| zxi@x;Gi06JdT=l72d|R}h;2DbpB6XdY!cqDm@BU(&YT4=;#ToaA?i!Z)IGlJc1ADH zIm6dvaMP?Lf}3KcN+Q@48ipw2jXW1>6_NP>OYx2Q2vPSm; z!1x09hS^@HZVFwrDi>lUU8KN8_eK|6srzc#MR$aqim)kPGS05el}`s7YkY`A+r1p0aI{k| z3yj|>V4v2Izg7ePyaxVF4V;YdMvG-g(l*`{UDsQ9rC<+bNxGx!L~EieeWJa+NAFGd zCR)4nH0c~E3i2@CF~^ zRVCNwtzrynZ`ib*i=cy+%z<>jZRD{d|37J90En>Xi8uDegJR)C!EN_~vaODcXfx5B34y>dIT3967^wi{&dYvYfmQZ+AOD9wR$;aKC-Q&PIjN8Lk6$_EU)_H-->9-E{YPbB_@<#rzdqXZ-#tKO!SDH^ W^5f4RzD?Ei&&l|miYn*)`u_sI;|0F} diff --git a/textureatlas.o b/textureatlas.o deleted file mode 100644 index ddd110bbe7d610d4ffe601c5132a5f1e973b3a2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5136 zcmd5=TWnNC7@pm2X;GjnA{RkZ9*QNQOA93iMY6OxWk?!YDI1BTSq{6~c4aU1>^X7? zSk1DAlg(liV}f8}^+g_hAn~PwgvDYPqQ*X%n)uK}O$x0^iI@;HS^s~|%y#y0)_^94 zKbbQ#-+cdNZvSjMq;z(;T`nTTMYfaqo@X%^Au(Iz!74-|_<`%FgFR4SsUHXf!I zliHz(w(+nE>p4QrzMJN;f|-Jn#|WXm&g%)R3(6!`K>CS&&k!=M zoCWxtZ!pn6u6#ranIqtzaWgt^-Sk%xl6@ZsV13TauP5_pO(z!^fw8>20=WQC?a(mo#}=S?D&<(V3I8MG@G*P=67yFEWhr$%vl(PP~W1ta+?V8WBX8{ zrDto4#&FR%RWwQlX!=?`%z}mP93;)Xgj-P-=DJdtRgZF*Ly$78)m-o>hl%&W3bV$D zJ=Bic4#q$3<9&y1CiFk}8iyn>uAG7S;Z1(d*a`=Fgnm)VC6}yRV#KLgOU-??FcgC1 zl4v5-q~7^VFtg3F&}D3Pwh)eT3w;H@H_|ljUn=F1G`rz0%S3CgWx7M)XKw)gIQ zW{1QM4}z803(6c`gMz{?!p(P~4Jp-B=A;A!&rABmT-VUTf^w%C2s1U%@Gz}e_>!3| zS!K>Sk0=w=1?dDHq4{Sft<2S?m04F-nSD{Yb9@Z^QAlUYzD8TXoh+%i)5^3fePVh= z-RXW<=HcNRV|;}}hL%cdzW!(*DMNzcwEcI2IJ}ONg?>`;NPP@dEdLU=UId&^E+DuH#3HD`}7WBBLgk2-$}{j=w~3&SKW(8XmSvnq?VC0w4@XA-_#vOg)|DzP%<8mBw#F&)FVFltRbkU}KCZJ1%|5ofs zV)wrl#t>_kIM{rH$B*&JBJ@Sw27{t4^FDdN`R@TGq}t;@&-LqNqtF)XFW}dpf&T6K z*SY?PAoAL-kEhUS|3~q013AFHgy8<;uR)#_d c4#^-jw#Bt|3FZzb{gs%UKy<4reeL>x1NLekqW}N^ diff --git a/uiContainer.o b/uiContainer.o deleted file mode 100644 index 6f9d2fa88ea61deee02bd664061faaec1a2baab8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3264 zcmbtW-D@LN6u;B7TV4B+6-BYD#s`-wcDB(KtcawE(~O$6x^2`4bvjM%HgTItoZQ*X z%Bq!$><|ihk_rp1Am|_9gFe|+q4hKcM=EQgV{ywlDX!sV^h%@Nuhk(2Hn5nfwl=Apg}$ zrJt~pU9VGCKfdTOR(156vqU-&t5iKpU0UoBsksz#!$_v;u(IP(Lb936qlxkSqUSI# zF{Pi-Cnu6#;3eODa8jQ2KXpOiw zHZ*uc3%2Sg;5bm?xOK)z{N29H@S)hC29zN7SP&)TCe$LH#%P%P5|6(v$NL%q0c&62 z@uxcC(_sM~Qx&$-PyV{D;^@bE-ay2~ukFl=1*_AEg>`VXx+O*iyFox=1b=b2#E5kH zrErWKlDyCy1$DF3f3W6&9fyJYr-}hUFFY54zZiipMd0Tm@QV@n`+#HrqVM2L0EUkQ z;$ygRAi-Gx{R50%{r?$(<5P=uF7Z0SnE~!m@O#xEUKy{AU3RFe7fAlVd(tVhXKk-e zC5%|v+-!O}XU)#c%o+36{B$~JSfpYvFINjBSG9}tw81==k}PF&1(#Cig>sRV4qTI# zmr9JJgPV?1gch-^IW{8LO90LlU)o9Ry z$0(mzD)fYFpOaipN0f769q)mGf^WkRjP~_VCJ_XIcO!U11pY{XhWuf$1)kx!;E!?dl7wpAmMoT1isC2(SMrzS0z54H^D#5&m*qe5ea`z z!tsq2{C6ZAKbivnR>E(S@C4W>*bfdNDQ*Z{+`9z@7x!*O!Nolydi{Kb*^8i=8|sp< zT)J%Q3=Tfg;UwBbU#!=O?p8ymP_0y`12Lz{s1DzjiQuGjf64Lmnp>?=mz{?ktVB!J zX%~(=@8tif1f=7VsV`{?FqB{UdWK%e6*lTI7`SIC7_w~hg6ljV-!U}B3x7K&ALF?C zWjQ8q66c~)+93}BhBg0dev;QzrxWwfLR=Pg{wW9|ChoW3db}X^CyU4zIt@W#%e)WO zhImlro&p@drYijt4kUP)t??6vfsyt From 2ff46e2582b09fc2c274e88c46270395e9da6e8b Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 4 Jan 2023 20:43:10 +0100 Subject: [PATCH 11/16] Pause Menu added and smal debug view --- .vscode/settings.json | 3 ++- Makefile | 5 ++++- Ui/button.c | 4 ++++ Ui/button.h | 2 ++ Ui/debug.c | 29 +++++++++++++++++++++++++++++ Ui/debug.h | 11 +++++++++++ Ui/uiContainer.c | 12 +++++++++++- main.c | 21 +++++++++------------ 8 files changed, 72 insertions(+), 15 deletions(-) create mode 100644 Ui/debug.c create mode 100644 Ui/debug.h diff --git a/.vscode/settings.json b/.vscode/settings.json index f0c1e26..059e6ac 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,7 +12,8 @@ "buttons.h": "c", "string.h": "c", "uicontainer.h": "c", - "button.h": "c" + "button.h": "c", + "cstdio": "c" }, "C_Cpp.errorSquiggles": "disabled" } \ No newline at end of file diff --git a/Makefile b/Makefile index da13a5c..63f0ea9 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CC = gcc FLAGS = -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 -OBJS = main.o sprite.o inputHandler.o isometricMap.o list.o game.o textureatlas.o animation.o animationHandler.o bucket.o mergeSort.o button.o uiContainer.o +OBJS = main.o sprite.o inputHandler.o isometricMap.o list.o game.o textureatlas.o animation.o animationHandler.o bucket.o mergeSort.o button.o uiContainer.o debug.o spiel: $(OBJS) $(CC) -o spiel $(OBJS) $(FLAGS) @@ -44,5 +44,8 @@ button.o: Ui/button.c uiContainer.o: Ui/uiContainer.c $(CC) -c Ui/uiContainer.c $(FLAGS) +debug.o: Ui/debug.c + $(CC) -c Ui/debug.c $(FLAGS) + clean: rm *.o spiel diff --git a/Ui/button.c b/Ui/button.c index e62a877..fc84a6b 100644 --- a/Ui/button.c +++ b/Ui/button.c @@ -32,6 +32,10 @@ void ButtonExecuteButton(Button *button, Game *game){ game->screen = SCREEN_GAME; } break; + case BUTTON_ID_EXIT: + // wahrscheinlich kein guter stil, es muss noch zeug freigegeben werden oder soos... keine Ahnung + exit(1); + break; } } diff --git a/Ui/button.h b/Ui/button.h index df33050..9d82a68 100644 --- a/Ui/button.h +++ b/Ui/button.h @@ -12,6 +12,7 @@ #define BUTTON_STATE_RELEASED 3 #define BUTTON_ID_CONTINUE 0 +#define BUTTON_ID_EXIT 1 typedef struct Button{ Texture2D textures[4]; // [0]: Normal [1]: Hovered [2]: Pressed [3]: Released @@ -22,6 +23,7 @@ typedef struct Button{ int id; } Button; +// Textures: [0]: Normal [1]: Hovered [2]: Pressed [3]: Released Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text, int textLEN, int id); // executes the logic of one button of certain id - huge switch? diff --git a/Ui/debug.c b/Ui/debug.c new file mode 100644 index 0000000..9862e86 --- /dev/null +++ b/Ui/debug.c @@ -0,0 +1,29 @@ +#include "debug.h" +#include "../game.h" +#include "uiContainer.h" +#include "string.h" +#include +#include "../Input/inputHandler.h" + +void DebugDraw(Game *game, UiContainer *uiContainer){ + + // Platz für bis zu 10 Strings der Länge 40 + char strings[10][41]; + + int lineamount = 0; + + sprintf(strings[lineamount++], "Screen: %d", game->screen); + sprintf(strings[lineamount++], "MouseScreenX: %d", GetMouseX()); + sprintf(strings[lineamount++], "MouseScreenY: %d", GetMouseY()); + sprintf(strings[lineamount++], "MouseWorldX: %d", (int)game->inputHandler->cursorWorldPos.x); + sprintf(strings[lineamount++], "MouseWorldY: %d", (int)game->inputHandler->cursorWorldPos.y); + + DrawRectangleLines(0, 0, 200, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 255}); + DrawRectangle(0, 0, 200, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 150}); + + int counter = 0; + while(counter < lineamount){ + DrawText(strings[counter], 2, counter * DEBUG_FONT_SIZE + 2, DEBUG_FONT_SIZE, RED); + counter++; + } +} \ No newline at end of file diff --git a/Ui/debug.h b/Ui/debug.h new file mode 100644 index 0000000..d2e50f0 --- /dev/null +++ b/Ui/debug.h @@ -0,0 +1,11 @@ +#ifndef DEBUG_H_ +#define DEBUG_H_ + +#include "../game.h" +#include "uiContainer.h" + +#define DEBUG_FONT_SIZE 18 + +void DebugDraw(Game *game, UiContainer *uiContainer); + +#endif \ No newline at end of file diff --git a/Ui/uiContainer.c b/Ui/uiContainer.c index 264e180..972e633 100644 --- a/Ui/uiContainer.c +++ b/Ui/uiContainer.c @@ -12,12 +12,22 @@ UiContainer * UiContainerInitPauseUiContainer(){ LoadTexture("assets/button_hovered.png"), //HOVERED LoadTexture("assets/button_pressed.png"), //PRESSED LoadTexture("assets/button_pressed.png")}; //RELEASED - Vector2 position = (Vector2){GetScreenWidth()/2 - textures[0].width/2, GetScreenHeight()/2 + 150}; + Vector2 position = (Vector2){GetScreenWidth()/2 - textures[0].width/2, GetScreenHeight()/2 - 300}; Button *continuebutton = ButtonInitButton(textures, &position, "Continue", 9, BUTTON_ID_CONTINUE); uiContainer->buttons[0] = continuebutton; uiContainer->buttonCounter = 1; + Texture2D textures2[4] = { LoadTexture("assets/button.png"), //DEFAULT + LoadTexture("assets/button_hovered.png"), //HOVERED + LoadTexture("assets/button_pressed.png"), //PRESSED + LoadTexture("assets/button_pressed.png")}; //RELEASED + + Vector2 position2 = (Vector2){GetScreenWidth()/2 - textures[0].width/2, GetScreenHeight()/2 - 50}; + Button *exitButton = ButtonInitButton(textures2, &position2, "EXIT", 5, BUTTON_ID_EXIT); + uiContainer->buttons[1] = exitButton; + uiContainer->buttonCounter = 2; + // Methode funktioniert wieso auch immer auch ohne dieses return. C returned Implizit odder was O_o return uiContainer; } diff --git a/main.c b/main.c index 39b276b..b5ba365 100644 --- a/main.c +++ b/main.c @@ -13,6 +13,7 @@ #include "Ui/screenIDs.h" #include "Ui/button.h" #include "Ui/uiContainer.h" +#include "Ui/debug.h" int main(){ @@ -35,6 +36,7 @@ int main(){ game->cursorSprite->x = GetMousePosition().x; game->cursorSprite->y = GetMousePosition().y; + BeginDrawing(); switch(game->screen){ case SCREEN_EXIT: return 0; @@ -49,7 +51,6 @@ int main(){ ListActAllSprites(game); ClearBackground(RAYWHITE); - BeginDrawing(); BeginMode2D(*(game->camera)); @@ -58,17 +59,12 @@ int main(){ IsometricMapDraw(game); EndMode2D(); - DrawSpriteToScreen(game->cursorSprite); // User Input Handling mouseInput(game); keyboardInput(game->inputHandler, game->camera); - - DrawFPS(GetScreenWidth() - 95, 10); - - EndDrawing(); - + if(IsKeyPressed(KEY_P)){ game->screen = SCREEN_PAUSE; } @@ -77,9 +73,6 @@ int main(){ case SCREEN_PAUSE: ClearBackground(RAYWHITE); - - BeginDrawing(); - BeginMode2D(*(game->camera)); IsometricMapDraw(game); EndMode2D(); @@ -91,10 +84,10 @@ int main(){ UiContainerUpdateUiContainer(pauseScreenUiContainer, game); UiContainerDrawUiContainer(pauseScreenUiContainer); + DebugDraw(game, pauseScreenUiContainer); + DrawSpriteToScreen(game->cursorSprite); - DrawFPS(GetScreenWidth() - 95, 10); - EndDrawing(); if(IsKeyPressed(KEY_P)){ game->screen = SCREEN_GAME; @@ -105,6 +98,10 @@ int main(){ return 1; break; } + BeginDrawing(); + DebugDraw(game, pauseScreenUiContainer); + DrawFPS(GetScreenWidth() - 95, 10); + EndDrawing(); From e4560ac264fc64eb153592880e187d29fa361ae0 Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 5 Jan 2023 12:29:39 +0100 Subject: [PATCH 12/16] MainMenu added --- README.md | 1 + Ui/button.c | 18 ++++++++++++------ Ui/button.h | 14 +++++++------- Ui/debug.c | 16 ++++++++++------ Ui/debug.h | 3 ++- Ui/uiContainer.c | 31 ++++++++++++++++++++++++++----- Ui/uiContainer.h | 7 +++---- game.c | 2 +- main.c | 37 ++++++++++++++++++++----------------- 9 files changed, 82 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index b4b9834..dd6ddf9 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Fantasy Welt oder Realistisch? [Sprite sortierung nach Nähe zur Kamera](https://gamedev.stackexchange.com/questions/8151/how-do-i-sort-isometric-sprites-into-the-correct-order) +[turn off EXIT on ESC Key, for later](https://github.com/raysan5/raylib/issues/520) ## TODO + LinkedList erweitern diff --git a/Ui/button.c b/Ui/button.c index fc84a6b..714617b 100644 --- a/Ui/button.c +++ b/Ui/button.c @@ -6,7 +6,7 @@ #include "raylib.h" #include "string.h" -Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text, int textLEN, int id){ +Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text, int textLEN, int fontSize, int id){ Button *button = malloc(sizeof(Button)); button->textures[0] = textures[0]; @@ -21,6 +21,8 @@ Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text, button->state = BUTTON_STATE_DEFAULT; button->id = id; + button->fontSize = fontSize; + return button; } @@ -28,13 +30,17 @@ void ButtonExecuteButton(Button *button, Game *game){ button->state = BUTTON_STATE_DEFAULT; switch(button->id){ case BUTTON_ID_CONTINUE: // continue game - if(game->screen == SCREEN_PAUSE){ - game->screen = SCREEN_GAME; - } + game->screen = SCREEN_GAME; break; case BUTTON_ID_EXIT: // wahrscheinlich kein guter stil, es muss noch zeug freigegeben werden oder soos... keine Ahnung - exit(1); + game->screen = SCREEN_EXIT; + break; + case BUTTON_ID_START_GAME: + game->screen = SCREEN_GAME; + break; + default: + printf("\n\n\n\n\n\n Unsupported Button ID %d \n\n\n\n\n\n", button->id); break; } } @@ -42,7 +48,7 @@ void ButtonExecuteButton(Button *button, Game *game){ void ButtonDrawButton(Button * button){ // erst Button Texture, dann Text zentriert drauf DrawTexture(button->textures[button->state], button->position.x, button->position.y, WHITE); - DrawText(button->text, button->centerPosition.x - MeasureText(button->text, BUTTON_FONT_SIZE)/2, button->centerPosition.y - BUTTON_FONT_SIZE/2, BUTTON_FONT_SIZE, BLACK); + DrawText(button->text, button->centerPosition.x - MeasureText(button->text, button->fontSize)/2, button->centerPosition.y - button->fontSize/2, button->fontSize, BLACK); } int ButtonUpdateButtonState(Button * button){ diff --git a/Ui/button.h b/Ui/button.h index 9d82a68..f8aa218 100644 --- a/Ui/button.h +++ b/Ui/button.h @@ -4,8 +4,6 @@ #include "raylib.h" #include "../game.h" -#define BUTTON_FONT_SIZE 36 - #define BUTTON_STATE_DEFAULT 0 #define BUTTON_STATE_HOVERED 1 #define BUTTON_STATE_PRESSED 2 @@ -13,18 +11,20 @@ #define BUTTON_ID_CONTINUE 0 #define BUTTON_ID_EXIT 1 +#define BUTTON_ID_START_GAME 2 typedef struct Button{ Texture2D textures[4]; // [0]: Normal [1]: Hovered [2]: Pressed [3]: Released - Vector2 position; - Vector2 centerPosition; - char text[20]; + Vector2 position; // Linke obere Ecke des Buttons + Vector2 centerPosition; // Die Mitte des Buttons + char text[20]; // Text, den der Button zentriert anzeigt, aktuell max. 19 Zeichen int state; // 0: default 1: hovered 2: pressed 3: released - int id; + int id; // Durch die ID wird dem Button eine Funktion zugeordnet + int fontSize; // FontSize kann für jeden Button individuell festgelegt werden } Button; // Textures: [0]: Normal [1]: Hovered [2]: Pressed [3]: Released -Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text, int textLEN, int id); +Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text, int textLEN, int fontSize, int id); // executes the logic of one button of certain id - huge switch? void ButtonExecuteButton(Button *button, Game * game); diff --git a/Ui/debug.c b/Ui/debug.c index 9862e86..8bead17 100644 --- a/Ui/debug.c +++ b/Ui/debug.c @@ -7,20 +7,24 @@ void DebugDraw(Game *game, UiContainer *uiContainer){ - // Platz für bis zu 10 Strings der Länge 40 - char strings[10][41]; - - int lineamount = 0; + char strings[10][41]; // Platz für bis zu 10 Strings der Länge 40 + int lineamount = 0; // sollte aktuell gehalten werden, wie viele Lines sind aktuell im Strings Array + // Hier die Debug Information in den Strings Array einfügen + // im Endeffekt einfach im Array an der Stelle lineamount++ die Elemente einfügen sprintf(strings[lineamount++], "Screen: %d", game->screen); sprintf(strings[lineamount++], "MouseScreenX: %d", GetMouseX()); sprintf(strings[lineamount++], "MouseScreenY: %d", GetMouseY()); sprintf(strings[lineamount++], "MouseWorldX: %d", (int)game->inputHandler->cursorWorldPos.x); sprintf(strings[lineamount++], "MouseWorldY: %d", (int)game->inputHandler->cursorWorldPos.y); + sprintf(strings[lineamount++], "Selected Layer: %d", game->inputHandler->selectedLayer); + sprintf(strings[lineamount++], "DEPTH: %d", (int)(game->inputHandler->cursorWorldPos.x + game->inputHandler->cursorWorldPos.y + game->inputHandler->selectedLayer)); - DrawRectangleLines(0, 0, 200, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 255}); - DrawRectangle(0, 0, 200, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 150}); + // Drawed eine Box für die Debug Info + DrawRectangleLines(0, 0, 250, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 255}); + DrawRectangle(0, 0, 250, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 150}); + // Drawed den Inhalt des "strings" Arrays int counter = 0; while(counter < lineamount){ DrawText(strings[counter], 2, counter * DEBUG_FONT_SIZE + 2, DEBUG_FONT_SIZE, RED); diff --git a/Ui/debug.h b/Ui/debug.h index d2e50f0..cc1b90b 100644 --- a/Ui/debug.h +++ b/Ui/debug.h @@ -4,8 +4,9 @@ #include "../game.h" #include "uiContainer.h" -#define DEBUG_FONT_SIZE 18 +#define DEBUG_FONT_SIZE 20 +// Drawed das Debug Fenster in die obere Linke Ecke void DebugDraw(Game *game, UiContainer *uiContainer); #endif \ No newline at end of file diff --git a/Ui/uiContainer.c b/Ui/uiContainer.c index 972e633..2bd3527 100644 --- a/Ui/uiContainer.c +++ b/Ui/uiContainer.c @@ -12,19 +12,40 @@ UiContainer * UiContainerInitPauseUiContainer(){ LoadTexture("assets/button_hovered.png"), //HOVERED LoadTexture("assets/button_pressed.png"), //PRESSED LoadTexture("assets/button_pressed.png")}; //RELEASED - Vector2 position = (Vector2){GetScreenWidth()/2 - textures[0].width/2, GetScreenHeight()/2 - 300}; + Vector2 position = (Vector2){GetScreenWidth()/2 - textures[0].width/2, GetScreenHeight()/2 - 50}; + int buttonFontSize = 36; - Button *continuebutton = ButtonInitButton(textures, &position, "Continue", 9, BUTTON_ID_CONTINUE); + Button *continuebutton = ButtonInitButton(textures, &position, "Continue", 9, buttonFontSize, BUTTON_ID_CONTINUE); uiContainer->buttons[0] = continuebutton; uiContainer->buttonCounter = 1; - Texture2D textures2[4] = { LoadTexture("assets/button.png"), //DEFAULT + position.y += 250; + + Button *exitButton = ButtonInitButton(textures, &position, "EXIT", 5, buttonFontSize, BUTTON_ID_EXIT); + uiContainer->buttons[1] = exitButton; + uiContainer->buttonCounter = 2; + + // Methode funktioniert wieso auch immer auch ohne dieses return. C returned Implizit odder was O_o + return uiContainer; +} + +UiContainer * UiContainerInitMainMenuUiContainer(){ + UiContainer *uiContainer = malloc(sizeof(UiContainer)); + + Texture2D textures[4] = { LoadTexture("assets/button.png"), //DEFAULT LoadTexture("assets/button_hovered.png"), //HOVERED LoadTexture("assets/button_pressed.png"), //PRESSED LoadTexture("assets/button_pressed.png")}; //RELEASED + Vector2 position = (Vector2){GetScreenWidth()/2 - textures[0].width/2, GetScreenHeight()/2 - 50}; + int buttonFontSize = 36; + + Button *continuebutton = ButtonInitButton(textures, &position, "Start Game", 11, buttonFontSize, BUTTON_ID_START_GAME); + uiContainer->buttons[0] = continuebutton; + uiContainer->buttonCounter = 1; + + position.y += 250; - Vector2 position2 = (Vector2){GetScreenWidth()/2 - textures[0].width/2, GetScreenHeight()/2 - 50}; - Button *exitButton = ButtonInitButton(textures2, &position2, "EXIT", 5, BUTTON_ID_EXIT); + Button *exitButton = ButtonInitButton(textures, &position, "EXIT", 5, buttonFontSize, BUTTON_ID_EXIT); uiContainer->buttons[1] = exitButton; uiContainer->buttonCounter = 2; diff --git a/Ui/uiContainer.h b/Ui/uiContainer.h index 16c9f25..fa85d1b 100644 --- a/Ui/uiContainer.h +++ b/Ui/uiContainer.h @@ -6,16 +6,15 @@ #include "../game.h" typedef struct UiContainer{ - Button *buttons[15]; - int buttonCounter; + Button *buttons[15]; // Platz für max. 15 Buttons + int buttonCounter; // Zeigt wie viele Buttons der UiContainer aktuell schon speichert } UiContainer; -// executes the logic of one button of certain id - huge switch? void UiContainerUpdateUiContainer(UiContainer *uiContainer, Game *game); void UiContainerDrawUiContainer(UiContainer *uiContainer); UiContainer * UiContainerInitPauseUiContainer(); UiContainer * UiContainerInitGameUiContainer(); - +UiContainer * UiContainerInitMainMenuUiContainer(); #endif \ No newline at end of file diff --git a/game.c b/game.c index 88940df..d2d4f89 100644 --- a/game.c +++ b/game.c @@ -31,7 +31,7 @@ Game *GameInit() game->inputHandler->cursorTextures = game->textures->cursorTextures; game->inputHandler->cursorSprite = game->cursorSprite; - game->screen = SCREEN_GAME; + game->screen = SCREEN_MAINMENU; game->camera = malloc(sizeof(Camera2D)); game->camera->target.x = 0; diff --git a/main.c b/main.c index b5ba365..ac85d42 100644 --- a/main.c +++ b/main.c @@ -24,6 +24,8 @@ int main(){ // TODO: Screen structs, die zum Beispiel die UiContainer enthalten? UiContainer *pauseScreenUiContainer = UiContainerInitPauseUiContainer(); + UiContainer *mainMenuScreenUiContainer = UiContainerInitMainMenuUiContainer(); + // Hides the operating systems own cursor HideCursor(); @@ -37,58 +39,57 @@ int main(){ game->cursorSprite->y = GetMousePosition().y; BeginDrawing(); + ClearBackground(RAYWHITE); switch(game->screen){ case SCREEN_EXIT: + printf("EXIT \n"); return 0; case SCREEN_MAINMENU: - printf("MAINMENU \n"); - return 0; + // MainMenu hat aktuell nur paar Buttons + UiContainerUpdateUiContainer(mainMenuScreenUiContainer, game); + UiContainerDrawUiContainer(mainMenuScreenUiContainer); + break; case SCREEN_OPTIONS: printf("OPTIONS \n"); return 0; case SCREEN_GAME: + // Updating Sprites ListActAllSprites(game); - ClearBackground(RAYWHITE); - - BeginMode2D(*(game->camera)); - - //IsometricRendererRenderIsometricMap(game); - //ListDrawAllSprites(game->sprites, game->layers, game->camera); + // Drawing IsometricMap + BeginMode2D(*(game->camera)); // Sorgt dafür, dass die Kameraposition beachtet wird IsometricMapDraw(game); - EndMode2D(); - DrawSpriteToScreen(game->cursorSprite); // User Input Handling mouseInput(game); keyboardInput(game->inputHandler, game->camera); - + if(IsKeyPressed(KEY_P)){ game->screen = SCREEN_PAUSE; } break; case SCREEN_PAUSE: - ClearBackground(RAYWHITE); - BeginMode2D(*(game->camera)); + // Still drawing isometric map, which is not updated atm + BeginMode2D(*(game->camera)); // Sorgt dafür, dass die Kameraposition beachtet wird IsometricMapDraw(game); EndMode2D(); + // darkened background + "Paused" Text DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), (Color){0, 0, 0, 150}); int textWidthHalf = MeasureText("Paused", 28) / 2; DrawText("Paused", GetScreenWidth()/2 - textWidthHalf, GetScreenHeight()/2 - 14, 28, WHITE); + // Button / UI stuff UiContainerUpdateUiContainer(pauseScreenUiContainer, game); UiContainerDrawUiContainer(pauseScreenUiContainer); + // Debug Menu DebugDraw(game, pauseScreenUiContainer); - DrawSpriteToScreen(game->cursorSprite); - - if(IsKeyPressed(KEY_P)){ game->screen = SCREEN_GAME; } @@ -98,9 +99,11 @@ int main(){ return 1; break; } - BeginDrawing(); + // Dinge die grundsätzlich immer gedrawed werden sollen + // Debug Menu, FPS anzeige, Cursor DebugDraw(game, pauseScreenUiContainer); DrawFPS(GetScreenWidth() - 95, 10); + DrawSpriteToScreen(game->cursorSprite); EndDrawing(); From 94e809af6d4572b642a07cae39449d206786315d Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 5 Jan 2023 12:37:15 +0100 Subject: [PATCH 13/16] comment --- DepthSorting/bucket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/DepthSorting/bucket.c b/DepthSorting/bucket.c index 6b40127..104dfcb 100644 --- a/DepthSorting/bucket.c +++ b/DepthSorting/bucket.c @@ -18,6 +18,7 @@ Bucket * BucketInit(Sprite *sprite, Tile *tile){ bucket->type = 1; bucket->sprite = 0; bucket->tile = tile; + // TODO: Aktuell wird die Depth an der oberen Ecke berechnet, müsste es die untere sein? Oder eher die Mitte? Das scheint mir problematisch zu sein :o bucket->depth = tile->x * 32 + tile->y * 32 + tile->z; return bucket; } From de0dacd8147b9e7d56cb18ae12709b7e4041ec1a Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Fri, 6 Jan 2023 15:12:21 +0100 Subject: [PATCH 14/16] minor tweaks --- Ui/button.h | 16 ++++++++-------- Ui/debug.c | 7 ++++--- Ui/debug.h | 2 +- Ui/screenIDs.h | 2 +- main.c | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Ui/button.h b/Ui/button.h index f8aa218..23fb19c 100644 --- a/Ui/button.h +++ b/Ui/button.h @@ -4,14 +4,14 @@ #include "raylib.h" #include "../game.h" -#define BUTTON_STATE_DEFAULT 0 -#define BUTTON_STATE_HOVERED 1 -#define BUTTON_STATE_PRESSED 2 -#define BUTTON_STATE_RELEASED 3 - -#define BUTTON_ID_CONTINUE 0 -#define BUTTON_ID_EXIT 1 -#define BUTTON_ID_START_GAME 2 +#define BUTTON_STATE_DEFAULT 0 // button is just there +#define BUTTON_STATE_HOVERED 1 // mouse is being hovered over the button +#define BUTTON_STATE_PRESSED 2 // left mouse button is down while hovering the button +#define BUTTON_STATE_RELEASED 3 // left mouse button is released while hovering the button, button code will be executed + +#define BUTTON_ID_CONTINUE 0 // going to game screen, supposed to be used from pause screen +#define BUTTON_ID_EXIT 1 // closing the game using exit code 0 +#define BUTTON_ID_START_GAME 2 // going to game screen, supposed to be used from mainmenu screen typedef struct Button{ Texture2D textures[4]; // [0]: Normal [1]: Hovered [2]: Pressed [3]: Released diff --git a/Ui/debug.c b/Ui/debug.c index 8bead17..af96d7c 100644 --- a/Ui/debug.c +++ b/Ui/debug.c @@ -9,6 +9,7 @@ void DebugDraw(Game *game, UiContainer *uiContainer){ char strings[10][41]; // Platz für bis zu 10 Strings der Länge 40 int lineamount = 0; // sollte aktuell gehalten werden, wie viele Lines sind aktuell im Strings Array + int neededWidth = MeasureText("1234567890123456789012345", DEBUG_FONT_SIZE); // sollte an den längsten debug String angepasst werden, damit dieser noch reinpasst // Hier die Debug Information in den Strings Array einfügen // im Endeffekt einfach im Array an der Stelle lineamount++ die Elemente einfügen @@ -21,13 +22,13 @@ void DebugDraw(Game *game, UiContainer *uiContainer){ sprintf(strings[lineamount++], "DEPTH: %d", (int)(game->inputHandler->cursorWorldPos.x + game->inputHandler->cursorWorldPos.y + game->inputHandler->selectedLayer)); // Drawed eine Box für die Debug Info - DrawRectangleLines(0, 0, 250, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 255}); - DrawRectangle(0, 0, 250, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 150}); + DrawRectangleLines(0, 0, neededWidth, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 255}); + DrawRectangle(0, 0, neededWidth, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 150}); // Drawed den Inhalt des "strings" Arrays int counter = 0; while(counter < lineamount){ - DrawText(strings[counter], 2, counter * DEBUG_FONT_SIZE + 2, DEBUG_FONT_SIZE, RED); + DrawText(strings[counter], 2, counter * DEBUG_FONT_SIZE + 2, DEBUG_FONT_SIZE, (Color){220, 25, 25, 255}); counter++; } } \ No newline at end of file diff --git a/Ui/debug.h b/Ui/debug.h index cc1b90b..6524983 100644 --- a/Ui/debug.h +++ b/Ui/debug.h @@ -4,7 +4,7 @@ #include "../game.h" #include "uiContainer.h" -#define DEBUG_FONT_SIZE 20 +#define DEBUG_FONT_SIZE 20 // Font size of the Debug window // Drawed das Debug Fenster in die obere Linke Ecke void DebugDraw(Game *game, UiContainer *uiContainer); diff --git a/Ui/screenIDs.h b/Ui/screenIDs.h index e55f992..4108644 100644 --- a/Ui/screenIDs.h +++ b/Ui/screenIDs.h @@ -1,7 +1,7 @@ #ifndef SCREENIDS_H_ #define SCREENIDS_H_ -#define SCREEN_EXIT 0 +#define SCREEN_EXIT 0 // Will exit the game using code 0 #define SCREEN_MAINMENU 1 #define SCREEN_OPTIONS 2 #define SCREEN_GAME 3 diff --git a/main.c b/main.c index ac85d42..946355c 100644 --- a/main.c +++ b/main.c @@ -38,9 +38,9 @@ int main(){ game->cursorSprite->x = GetMousePosition().x; game->cursorSprite->y = GetMousePosition().y; - BeginDrawing(); - ClearBackground(RAYWHITE); - switch(game->screen){ + BeginDrawing(); // Drawing ist grundsätzlich immer aktiviert + ClearBackground(RAYWHITE); // Screen wird in jedem Frame gecleared + switch(game->screen){ // Screenspecific Code case SCREEN_EXIT: printf("EXIT \n"); return 0; From 4396ad0abc5f64e5fa742f537783231763f32bed Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Fri, 6 Jan 2023 16:17:46 +0100 Subject: [PATCH 15/16] Camera Zoom now works for input, still needs to be implemented for map drawing - will be done after refactor and merge of that system. Zoom using I and K --- Input/inputHandler.c | 20 +++++++++++++++++++- README.md | 2 +- Ui/debug.c | 1 + main.c | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Input/inputHandler.c b/Input/inputHandler.c index 1d87ea0..de8206a 100644 --- a/Input/inputHandler.c +++ b/Input/inputHandler.c @@ -50,6 +50,20 @@ void mouseInput(Game *game){ inputHandler->cursorPos.x = GetMousePosition().x; inputHandler->cursorPos.y = GetMousePosition().y; + + // bissl Kamera Zoom + float maxZoom = 5.0f; + float minZoom = 0.2f; + if(IsKeyPressed(KEY_I)){ + if(camera->zoom < maxZoom){ + camera->zoom += 0.2f; + } + } + if(IsKeyPressed(KEY_K)){ + if(camera->zoom > minZoom){ + camera->zoom -= 0.2f; + } + } // resetting last selected Tile to grass texture if(inputHandler->selectedLayer != -1){ IsometricMapChangeTextureIdOfTile(layers, (int) inputHandler->cursorWorldTile.x, (int) inputHandler->cursorWorldTile.y, inputHandler->selectedLayer, 0); @@ -64,7 +78,11 @@ void mouseInput(Game *game){ int mouseAdjustmentX = -tileWidthHalf; int mouseAdjustmentY = -tileHeightQuarter + (tileHeightQuarter * layers[n]->layer); - IsometricMapProject(layers[n], camera, inputHandler->cursorPos.x + mouseAdjustmentX, inputHandler->cursorPos.y + mouseAdjustmentY, &inputHandler->cursorWorldPos); + // Updating inputHandler->cursorWorldPos Vector2D + IsometricMapProject(layers[n], camera, + (inputHandler->cursorPos.x / camera->zoom) + mouseAdjustmentX, + (inputHandler->cursorPos.y / camera->zoom) + mouseAdjustmentY, + &inputHandler->cursorWorldPos); /*N I C E*/ Tile *selectedTile = IsometricMapGetTileFromWorldCoordinates(layers, inputHandler->cursorWorldPos.x, inputHandler->cursorWorldPos.y, n); diff --git a/README.md b/README.md index dd6ddf9..9854b69 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Fantasy Welt oder Realistisch? + LinkedList erweitern + Sprites Animationen etc improven -+ Die Inputs sollten den Kamera Zoom beachten, aktuell geht noch alles kaputt wenn man den zoom umstellt ++ Das Map Rendering sollte den Zoom auch noch beachten, wenn man rauszoomt wird nicht die ganzen map gedrawed, sondern nur die mit den default values + Maps in eigenen Dateien speichern + Parser für Map-Dateien + MapEditor diff --git a/Ui/debug.c b/Ui/debug.c index af96d7c..03fa708 100644 --- a/Ui/debug.c +++ b/Ui/debug.c @@ -20,6 +20,7 @@ void DebugDraw(Game *game, UiContainer *uiContainer){ sprintf(strings[lineamount++], "MouseWorldY: %d", (int)game->inputHandler->cursorWorldPos.y); sprintf(strings[lineamount++], "Selected Layer: %d", game->inputHandler->selectedLayer); sprintf(strings[lineamount++], "DEPTH: %d", (int)(game->inputHandler->cursorWorldPos.x + game->inputHandler->cursorWorldPos.y + game->inputHandler->selectedLayer)); + sprintf(strings[lineamount++], "Camera Zoom: %f", game->camera->zoom); // Drawed eine Box für die Debug Info DrawRectangleLines(0, 0, neededWidth, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 255}); diff --git a/main.c b/main.c index 946355c..ea99216 100644 --- a/main.c +++ b/main.c @@ -22,8 +22,8 @@ int main(){ Game *game = GameInit(); // TODO: Screen structs, die zum Beispiel die UiContainer enthalten? - UiContainer *pauseScreenUiContainer = UiContainerInitPauseUiContainer(); + UiContainer *pauseScreenUiContainer = UiContainerInitPauseUiContainer(); UiContainer *mainMenuScreenUiContainer = UiContainerInitMainMenuUiContainer(); // Hides the operating systems own cursor From d3deb4b2647f08486920361db059ca0cfdaf7388 Mon Sep 17 00:00:00 2001 From: JanEhehalt Date: Fri, 6 Jan 2023 16:41:08 +0100 Subject: [PATCH 16/16] debug add --- Ui/debug.c | 9 ++++++++- main.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Ui/debug.c b/Ui/debug.c index 03fa708..676a06b 100644 --- a/Ui/debug.c +++ b/Ui/debug.c @@ -7,7 +7,7 @@ void DebugDraw(Game *game, UiContainer *uiContainer){ - char strings[10][41]; // Platz für bis zu 10 Strings der Länge 40 + char strings[30][41]; // Platz für bis zu 30 Strings der Länge 40 int lineamount = 0; // sollte aktuell gehalten werden, wie viele Lines sind aktuell im Strings Array int neededWidth = MeasureText("1234567890123456789012345", DEBUG_FONT_SIZE); // sollte an den längsten debug String angepasst werden, damit dieser noch reinpasst @@ -21,6 +21,13 @@ void DebugDraw(Game *game, UiContainer *uiContainer){ sprintf(strings[lineamount++], "Selected Layer: %d", game->inputHandler->selectedLayer); sprintf(strings[lineamount++], "DEPTH: %d", (int)(game->inputHandler->cursorWorldPos.x + game->inputHandler->cursorWorldPos.y + game->inputHandler->selectedLayer)); sprintf(strings[lineamount++], "Camera Zoom: %f", game->camera->zoom); + + // Hier müssten wir eine bessere Lösung finden, das flackert weil pressed nur für einen Frame gilt. Eine ähnliche Funktion gibt es für CharDown leider nicht, müssten wir selbst programmieren. Ich habe es erstmal nicht auskommentiert. Kann man aber easy machen sollte es stören + int pressed = GetCharPressed(); + while(pressed != 0){ + sprintf(strings[lineamount++], "Ḱey Pressed: %c", pressed); + pressed = GetCharPressed(); + } // Drawed eine Box für die Debug Info DrawRectangleLines(0, 0, neededWidth, lineamount * DEBUG_FONT_SIZE + 5, (Color){0, 0, 0, 255}); diff --git a/main.c b/main.c index ea99216..48d3786 100644 --- a/main.c +++ b/main.c @@ -81,7 +81,14 @@ int main(){ // darkened background + "Paused" Text DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), (Color){0, 0, 0, 150}); int textWidthHalf = MeasureText("Paused", 28) / 2; - DrawText("Paused", GetScreenWidth()/2 - textWidthHalf, GetScreenHeight()/2 - 14, 28, WHITE); + DrawText("Paused", GetScreenWidth()/2 - textWidthHalf, GetScreenHeight()/4 - 14, 28, WHITE); + + // Controls lol + DrawText("I: Zoom in", 5, GetScreenHeight()/2, 16, WHITE); + DrawText("K: Zoom out", 5, GetScreenHeight()/2 + 16, 16, WHITE); + DrawText("P: Pause", 5, GetScreenHeight()/2 + 32, 16, WHITE); + DrawText("WASD: Move Camera", 5, GetScreenHeight()/2 + 48, 16, WHITE); + DrawText("ESC: Exit Game", 5, GetScreenHeight()/2 + 64, 16, WHITE); // Button / UI stuff UiContainerUpdateUiContainer(pauseScreenUiContainer, game);