From 167d02da10ead915ea420c72efbfac2ed518d1cc Mon Sep 17 00:00:00 2001 From: KikooDX Date: Thu, 13 Feb 2020 09:23:32 +0100 Subject: [PATCH] OK it just works. See bellow. Changed some stuff in levels.lua. Added levels.c to .gitignore. New player function `reset_old_pos`. --- .gitignore | 1 + levels.lua | 4 ++-- platform.g3a | Bin 51156 -> 51236 bytes src/levels.c | 13 ------------- src/main.c | 12 +++++++----- src/player.c | 6 ++++++ src/player.h | 1 + 7 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 src/levels.c diff --git a/.gitignore b/.gitignore index bbd56c6..de196e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ build*/** +src/levels.c diff --git a/levels.lua b/levels.lua index 3fd4003..e37e30b 100644 --- a/levels.lua +++ b/levels.lua @@ -17,8 +17,8 @@ levels = {[[ -0.........................- -0.........................- -0.........................- --0........................00 --0........................0- +-0.......................000 +-0.......................00- -00000000000000000000000000- ---------------------------- ]], diff --git a/platform.g3a b/platform.g3a index 7def09a217987f279be5cb9bd0aef2c986ee0396..1beebe54ad76973d71e789b4157afce3c9788ee6 100644 GIT binary patch delta 2267 zcmY*aeN0=|6+ibmfZ>tGfH5Wz-V2Z{Ezx|(%$m})wt=l#LNFvIc#J-WyN=lkA!j^A9r%0Hkgyf*Qh$pQC>_lxLb{Ea-0MqmC%9z6Hdwgw1!wziAx#tS-@ zMbcGpJAbhLE>}pUDsp-|t0xK4)C=#P?5;7ZHM=X(#Rc@l*oqi)7J=4?D{xkcL~G0| zZHm*I8;9UIxRj44;QG47b+7FmKJZ@b_RO|8LrhdBvXk9yj%B+#T=fyVM6i?dJ}R z{YCt5{&&36083!q&2Zn^{I0f-WCbk%seE9Y(jUh1q1x$_|QNJ zFXW2qWA}@%HGk4@Lr5v%mpeqYm#f-n@U@WUw9t`a&#ADGvPL_^MrPq1K2cq@(Fac7 z8a)+mWF2BVLFqYB-M?cEg64UPW5&!keqm1UO9+}AGxMgeO!E4S>g}}P>y8=J@Xf3{ zR8*Y2Mg>kt!63d4Q3+AC;Y~euza(Wn+6U{TnY}VACsxuZ7T(ROjdi#OYaP$~dATLE zeY5t#fef#`$rsu)ytgsz2)Ao5;4Qalej3G1nBD;w7q~BZH}B!`U$d{+2o6F`3AENWc2@fH8GUjcl(W54}b2`U$sFe=TyTT0@v)5=7q?K+W*4F_PylBh=q z;L)kDq>@FCE)Hpm5oZvXr)y_?jMYmMUA(G$2xy!ZAQ}Z)@t@el)1#ZnXCulGxJj!P zy&oafBXEMP`H1}pGXia_n9*8?a3Idq$*}vx$Aw7&zBZlS%f&*!=D#?XQ(n9Qr#wf5aKKaid{M;)eePJ zjYos3vVD7w%&W`=j#On6Ilyec_|oCyh@WjcUqJj4J(0aX0e2G_U}NrA$$+%r zuH|x5G#;H6526&0UyGY9okr?Gim5bzMLNdpegBT92Z4Ui&B{Hi+%8~7Z>yYZ-1|n{ zI?$s1(xx|okW1{*`@iJ`8=LCCzf-VboFHN@fOibk7&Am;Kf689EdMbY2eB8Na#*SB z1A(Nh0^NNHcS{jQpt*Bwf_<|kHOd-UDvb|aB0N{yk<0m+?43(%PLemujF#{5c6DlQ~o+s+t}unNK&C*>8!#sw)ycXu29eF zeDBC)*7r#!nx)_<7V6O)`O-z@BFbWkaC>yRDWI8njhW+$uDVB| z#(mfWF65maT?Q8N-Eu^%MR3s0C^k9|4w@W0U7*!C?D)`}@)!kBqaR+7fTao#C0F1* zqN0>C&1ab$l8*v8()T}4)iicuxXvdo=$?nA?AcmwF|v%l__XXTG0?rA0)1(EOF;9t Y#dul%^g*6Y-FlTgVh?ZqoofyJ53CEX-2eap delta 2277 zcmZ8iZ%kX)6+ibGg2^MT9fRW(5)(riD$9IHpmSR`?ATh<1h64MSi%QNp1}}WB@{BW zQJFOaIl}zQO=wEGj1DJ56;04yTIBSsPiY8kS+D=vlE0Ao34PuJ&0mVDdFVJ+) z`uW^@&hMUc&%Ni~>+4la^(gjzJo4w8y`F)t$;cD@{rgEIV#<04p81Z|OcC;Z|7d{S zcuvcbNsparEs z)$7I%m(|!m2gd8h&w^Ux-xk3*Z8uo>B^WS#rMa@_Rc}?hXK$CzLp$T{tESbtA;F(h zkX!i%-!$K<%p2|DOoQ(#7oqc8d&XO94QnUY>euSlfOoCkkDcCf^I>j?gkT2Zfo{)} z;<+P{Rh<7pO!QCzYj63H8&lhg>Hb2PCF$FNp8=bCCejHr1bB!ycFYlDzce{{YD-{T zup9b5|GFk$H%pvhy{1{$=hr9B9xCGXNx^C%Y~h=9$5-beP&Eg|-&Ko^r2m#)ZRYg` zry@{!BK%Im7snUCxX;Yb!Q?S3@1BE_N5w1knj_&fQxE6V4EiBHSoRGFY5M)OLl(Y9 z43wC0D!~$q^k00j+rsPB#Ve`GR|YKn+?l%fQ#B>jkgpD##vag`uyg2)?hRfz zo2onyE^$NCOk`cp^A8|knLZ%+&Aih+X-?{l3z!A}wD}7&Dkd8gZ)pPgg5No5=Ie%n zFTaxTfa*ED8r`xpI!n}T@k*DbW=Y{m@XdwRvr)#x%Wf7L(!I@`A zc5$=Hiq&6!XWG%FT@Zp9?po#y3*qKOTsYMnIKxGJvo5F-!c7?Jp%Bz82=kFzhM7hJ z8eFs{%+@pm@5kr2+B4o>`{ACG$Ixd^fH-NfvBwvQ)x*?ZXuQ{3a=1{d*&u;ELc~(sSjg`b= z*;oUtp|$(~Ru4c0x}sh!fLE(PPX~Iv+E|pT5Kw;Dn-oEP;^QC}P~2CTvxMysFZG|= z$Hka;d4)R4;K9`x9uxvG!iXZ3OzTFQTprB~C$Fjlx!-+M*nEauDGPlAC}>1`kb9EAzE= zb6f9;IloONM8zEMWo73%!a>CZ>4YF>$&z_VF+daZf(mD0Kw-;#@$hssOF4;M!))Ze zuV2uQ1r=C#ih1ZK(IuFX&H6FsJNwNx3iKy!h*880yV!o06tK#3S)@SpoZ|?W5@Ozt z{B2%&HZRMx+lTd`le~&k7xYBk4RntUlcfk;V?!&8x%lm- zHb=5Z+CN>oLXwbcz)g(uH!b35zn$BKYJS7jrU_{2J;V$f?cc$6T*?%Wf8coPMUEy% zjz%3H_^VdB>PlCo5zkIYynN+#Lb}<^hyHl8d>`U0M}BvNcrIK`+fxPj4A~8VSogZI zy5`9J7&BiRcE{K=q$?8W-YRC3SjdP$M&timrDc*nvF++l6}VHkKQeH}$1L>G3F)yY zi($4utZmJnkV`UqmDz@Bxarx`U%E -void set_level(int level_id, char *level) { - switch (level_id) - { - case 0: - memcpy(level, "-----------------------------00000000000000000000000000--0........................0--0........................0--0........................0--0........................0--0........................0--0........................0--0........................0--0........................00-0.........................--0.........................--0.........................--0........................00-0........................0--00000000000000000000000000-----------------------------", 476); - break; - case 1: - memcpy(level, "-----------------------------00000000000000000000000000--00000000000000000000000000--000000000000000000000000000-00000000000...............--0000000000................--0000000000....0000000000000-0000000000.....00000000000--00000000..........00000000-000000.............00000000--..........-.00000000000000--..........0000000000000000--.......0000000000000000000-000000000000000000000000000--00000000000000000000000000--00000000000000000000000000-----------------------------", 476); - break; - } -} diff --git a/src/main.c b/src/main.c index 22b47d9..451b86e 100644 --- a/src/main.c +++ b/src/main.c @@ -114,21 +114,23 @@ int main(void) player_y = start_y; } //borders collision - else if (player_x <= 2) + if (player_x <= 8) { - level_id--; - player_x = 229; + level_id -= 1; + player_x = 201; set_start_pos(&start_x, &start_y, player_x, player_y); set_level(level_id, level); draw_level(level); + reset_old_pos(&old_x, &old_y); } - else if (player_x >= 222) + else if (player_x >= 208) { - level_id++; + level_id += 1; player_x = 9; set_start_pos(&start_x, &start_y, player_x, player_y); set_level(level_id, level); draw_level(level); + reset_old_pos(&old_x, &old_y); } //exit if (keydown(KEY_EXIT)) return 0; diff --git a/src/player.c b/src/player.c index a6e5987..f87c90f 100644 --- a/src/player.c +++ b/src/player.c @@ -22,3 +22,9 @@ void set_start_pos(int *start_x, int *start_y, int x, int y) *start_x = x; *start_y = y; } + +void reset_old_pos(int *old_x, int *old_y) +{ + *old_x = -8; + *old_y = -8; +} diff --git a/src/player.h b/src/player.h index 8163e0b..69af390 100644 --- a/src/player.h +++ b/src/player.h @@ -1,2 +1,3 @@ void jump_test(char *jump_pressed, char *jump_buffer, unsigned int *jump_hold); void set_start_pos(int *start_x, int *start_y, int x, int y); +void reset_old_pos(int *old_x, int *old_y);