From 5ac0fc9f64b9c05179bc9b501e0391dc32f73c82 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Sun, 7 Dec 2014 15:03:21 -0600 Subject: [PATCH] Controls are PERFECT! I made it so that the controls are good and the collision detection code is just a simple place holder for 1 tile wwww modified: Project 16.bfproject modified: scroll.exe modified: src/scroll.c --- Project 16.bfproject | 198 ++++++++----------------------------------- scroll.exe | Bin 48780 -> 48796 bytes src/scroll.c | 28 +++--- 3 files changed, 52 insertions(+), 174 deletions(-) diff --git a/Project 16.bfproject b/Project 16.bfproject index 663f35e0..a453f15d 100644 --- a/Project 16.bfproject +++ b/Project 16.bfproject @@ -1,28 +1,6 @@ -<<<<<<< HEAD c2e.convert_special: 0 e2c.convert_num: 0 -openfiles: /dos/z/16/doc/project.txt:60:0:0: -openfiles: /dos/z/16/16.c:0:0:0: -openfiles: /dos/z/16/src/scroll.c:17553:16983:1: -openfiles: /dos/z/16/src/lib/scroll.c:359:0:0: -openfiles: /dos/z/16/src/lib/scroll.h:1961:241:0: -openfiles: /dos/z/16/src/v2/source/ENGINE/CONTROLS.C:2441:1179:0: -openfiles: /dos/z/16/src/lib/modex16.c:13778:13034:0: -openfiles: /dos/z/16/src/lib/modex16.h:2059:913:0: -openfiles: /dos/z/16/src/pcxtest.c:68:0:0: -openfiles: /dos/z/16/src/lib/dos_kb.c:3352:2801:0: -openfiles: /dos/z/16/src/lib/dos_kb.h:62:0:0: -openfiles: /dos/z/16/src/lib/lib_head.h:165:0:0: -openfiles: /dos/z/16/src/palettec.c:176:0:0: -openfiles: /dos/z/16/src/test.c:415:629:0: -openfiles: /dos/z/16/src/test2.c:18:0:0: -openfiles: /dos/z/16/src/lib/bitmap.c:59:0:0: -openfiles: /dos/z/16/src/lib/bitmap.h:125:0:0: -openfiles: /dos/z/16/src/lib/lib_head.cpp:0:0:0: -openfiles: /dos/z/16/src/lib/types.h:242:0:0: -openfiles: /dos/z/16/makefile:22:0:0: -openfiles: /dos/z/16/16/dos_gfx.cpp:6388:0:0: -openfiles: /dos/z/16/16/dos_gfx.h:175:233:0: +openfiles: /dos/z/16/src/scroll.c:0:378:1: snr_recursion_level: 0 convertcolumn_horizontally: 0 adv_open_matchname: 0 @@ -34,33 +12,18 @@ view_left_panel: 0 default_mime_type: text/plain e2c.convert_xml: 1 c2e.convert_iso: 0 -opendir: file:///dos/z/16/src/v2/source/ENGINE +opendir: file:///dos/z/16/src wrap_text_default: 0 bookmarks_filename_mode: 1 -ssearch_text: UnPress( -snr_casesens: 1 +snr_casesens: 0 view_blocks: 1 -name: project 16 -replacelist: dest -replacelist: animatePlayer(bg, spri, -replacelist: qi=1 -replacelist: qi<=( -replacelist: \t\t\t\t -replacelist: animatePlayer(bg, spri, mask, 1 -replacelist: animatePlayer(bg, spri, mask, 0 -replacelist: modexShowPage(mask-> -replacelist: modexShowPage(spri -replacelist: player.tx == player.ty -replacelist: TRIGGY -replacelist: TRIGGX -replacelist: $(SRCLIB) -replacelist: $(SRC) -replacelist: play-> +name: Project 16 fb_show_hidden_f: 0 editor_tab_width: 4 -show_visible_spacing: 1 +template: /usr/share/bluefish/templates/C_header_GPL +show_visible_spacing: 0 view_statusbar: 1 -display_right_margin: 0 +display_right_margin: 1 c2e.IE_apos_workaround: 0 outputb_scroll_mode: 0 leftpanel_active_tab: 0 @@ -69,125 +32,36 @@ ssearch_regex: 0 e2c.convert_iso: 0 ssearch_casesens: 0 charmap_block: 1 -======= -view_main_toolbar: 1 -bmarksearchmode: 0 -snr_scope: 0 -snr_type: 0 -view_cline: 0 -editor_indent_wspaces: 0 -c2e.convert_xml: 1 -snr_dotmatchall: 0 -c2e.convert_symbol: 0 -filegloblist: *.txt -filegloblist: *.shtml -filegloblist: *.py -filegloblist: *.pl -filegloblist: *.php -filegloblist: *.js -filegloblist: *.java -filegloblist: *.htm -filegloblist: *.html -filegloblist: *.h -filegloblist: *.css -filegloblist: *.cpp -filegloblist: *.cgi -filegloblist: *.c -filegloblist: * -fb_focus_follow: 1 +snr_replacetype: 0 +savedir: file:///dos/z/16/src +spell_check_default: 1 +spell_insert_entities: 0 +last_filefilter: +htmlbar_notebooktab: 0 +view_blockstack: 1 +snr_escape_chars: 0 +htmlbar_view: 1 +spell_lang: en +ssearch_dotmatchall: 0 +autocomplete: 1 +outputb_show_all_output: 0 +bookmarks_show_mode: 0 +snippets_show_as_menu: 1 adv_open_recursive: 0 -recent_dirs: file:///dos/z/16/16 -encoding: UTF-8 -autoindent: 1 +encoding: SHIFT_JIS e2c.convert_special: 0 +autoindent: 1 fb_viewmode: 0 -htmlbar_view: 0 -snippets_show_as_menu: 1 -bookmarks_show_mode: 0 -outputb_show_all_output: 0 -autocomplete: 1 -searchlist: mapDrawTile -searchlist: dxThresh -searchlist: PalFile -searchlist: src\\lib\\ -searchlist: player. -searchlist: src\\ -searchlist: void modexPalBlack(); -searchlist: oid modexPalBlack( -searchlist: id modexPalBlack( -searchlist: d modexPalBlack( -spell_lang: en -snr_escape_chars: 0 -view_blockstack: 1 -htmlbar_notebooktab: 0 -last_filefilter: -spell_insert_entities: 0 -spell_check_default: 1 -savedir: file:///dos/z/16/src -snr_replacetype: 0 ->>>>>>> 3a2e65f55f3d4f720e9076f68f6292f702369391 -recent_files: file:///dos/z/16/16/modex16/scroll.c -recent_files: file:///dos/z/16/16/modex16/dos_kb.c -recent_files: file:///dos/z/16/16/modex16/makefile -recent_files: file:///dos/z/16/16/dos_kb.c -recent_files: file:///dos/z/16/16/TEST.C -recent_files: file:///dos/z/16/16/dos_kb.h -recent_files: file:///dos/z/16/16/lib/lib_com.cpp -recent_files: file:///dos/z/16/16/lib/lib_com.h -recent_files: file:///dos/z/16/16/16.txt -recent_files: file:///dos/z/16/16/lib/x/MODEX.H -recent_files: file:///dos/z/16/16/modex16/dos_kb.h -recent_files: file:///dos/z/16/doc/16.16 -recent_files: file:///dos/z/16/doc/16story.txt -recent_files: file:///dos/z/16/README -recent_files: file:///dos/z/16/scroll.c -recent_files: file:///dos/z/16/dos_kb.h -recent_files: file:///dos/z/16/dos_kb.c -recent_files: file:///dos/z/16/lib/lib_head.h -recent_files: file:///dos/z/16/modex16.c -recent_files: file:///dos/z/16/modex16.h -recent_files: file:///dos/z/16/types.h -recent_files: file:///dos/z/16/pcxtest.c -recent_files: file:///dos/z/keen-src/id_mm.h -recent_files: file:///dos/z/keen-src/id_mm.c -recent_files: file:///dos/z/keen-src/id_rf.h -charmap_block: 1 -e2c.convert_iso: 0 -enable_syntax_scan: 1 -outputb_scroll_mode: 0 -leftpanel_active_tab: 0 -c2e.IE_apos_workaround: 0 -display_right_margin: 0 -replacelist: dest -replacelist: animatePlayer(bg, spri, -replacelist: qi=1 -replacelist: qi<=( -replacelist: \t\t\t\t -replacelist: animatePlayer(bg, spri, mask, 1 -replacelist: animatePlayer(bg, spri, mask, 0 -replacelist: modexShowPage(mask-> -replacelist: modexShowPage(spri -replacelist: player.tx == player.ty -editor_tab_width: 4 -view_statusbar: 1 -fb_show_hidden_f: 0 -name: project 16 -view_blocks: 1 -snr_casesens: 1 -c2e.convert_iso: 0 -bookmarks_filename_mode: 1 -wrap_text_default: 0 -opendir: file:///dos/z/16/src/v2/source/ENGINE -e2c.convert_xml: 1 -default_mime_type: text/plain -view_left_panel: 0 -htmlbar_thumbnailwidth: 300 -fb_show_backup_f: 0 -view_line_numbers: 1 -show_mbhl: 1 -adv_open_matchname: 0 -convertcolumn_horizontally: 0 -snr_recursion_level: 0 +recent_dirs: file:///dos/z/16/src +fb_focus_follow: 1 +ssearch_unescape: 0 +c2e.convert_symbol: 0 +snr_dotmatchall: 0 +c2e.convert_xml: 1 +editor_indent_wspaces: 0 +view_cline: 0 +snr_type: 0 +snr_scope: 2 +bmarksearchmode: 0 +view_main_toolbar: 1 e2c.convert_symbol: 0 -e2c.convert_num: 0 -c2e.convert_special: 0 diff --git a/scroll.exe b/scroll.exe index 6d3572cbcb30cd639b379f1bb0b2cc7a94a4d525..8734952f0fd0a9ee3a85bca195806e294d284ee3 100644 GIT binary patch delta 9024 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 z zl+ttN!nr?E`V~x@Cl7q#y(aY^;v_6sbhhz|<=Ex^pDf$VtLJUusFT@c(bJrJTVh+H z?WA)Ds!^I>Un0=B2L%rb5LH}^!IFy_#blVm$~OyHxi}L`|Lx{kOL@-oq8pL4MhRaz z5%PC(1{N20;i`LBJc_H|>na?OqS2BPURaF6R!N712v4E(on!$gRHM)@na&YmHA-3B z0*(-2CyI^SkDRatg{|CY$nHSt3xtsEM)4juk4NzjrpRlZgi}nB@8F5>0ZQNT3#GzE z6#Du4=~5!Rk7AZ|A(q1bV9_YOD-|p#Y?Xe7?9V8Dfe^9}vG_?kA4eguVzZOhS@1!j z)oGg(5gtS7rqe>1phDq}(+n9AQc#*HTPVW{IVf(H-IWPbP-vBXj%>CQsV83|hV(o{ zf0E6|%tAQMG@XlGg$kzWyv>;ijVRr8Ug#p!p>W4}x(gAWK`F~+p$k^{CyI?OKe`Be zP}u5n9oa)DeU1>a$56cIQs|1}2Pm#_-RpXdQbNiI*Y<8mT@_A~@IDevuI;Epgc~Tg zxcw6@l*V!w-G;$WrDM3y+*FWM_PBhQdz%NF$qTfqsG3OHOthkl`TQXcA>I8MSXY*z zIPdQ4A$*U(HFx5H-0vvHc&zmhenVlD$5QyFESYQbhy=g#MDBn`AWSY-a&O_MwtN^D z>Ddl|c$(*C=tKMo{QRywfot~+2A_&V{-CF~7i5%2$ezNXz3J%<#TCQ2V6S7)hU74> z=dI*#NalGx58qV8@W;F^dqa9vinGv)!#nGB0j5+A=Q_NPLv3XOciCGF-IaOV4ev?t zOXW09?Q;tzRb_DVe7=EoRZ91rK9_ui3vPsT`J9KNRSEnppEh4?E)_g<-rNJ9CQ#^< z?h|}#dK|v;>LnBpn9}M9EH_n;SB&-7``etZFVUjc>uAMyY^GWzgyi@O=C7*L zskh!gGeBHqGjT#1{KrA6p~mB`|3iNwWFZn7FdU8>;=MBiN~~%P2+j>y1h)-Ot4adi z7C{ylG{vAb)fjX{vXxwBb2|}NQcb{F*k&Bhy&W(g-ZQ3gUj*cV%rsFkKQJ!HYFc&C za%LI^L={_kg}72G10$itw1JBYS_J*3(cIXe0#MZ?M=c5hd!@=E-OvHKVCdD@42JSmDG*&- z!@U^%3GA+YjQcWJ0+(vn^Y?-ugh0jWen?*x$4NrfP_`A!&A-N(_y>8@9*F8-Qiz^gLhrL>P+_H!UNUw|M8YAMM zylx@4D?t zq}}(GT9b)6ay6~!#Z@NwdJ{4}vNY1R&@p6MSitxoJSTD~tgcU(@MPo(vHBx(ZmV94 zdg~((TdP-_3@qlvc2^+L9=RXBtWV)iM2-XRwU2Y>BZtGxwVwuk5czo|5ia-;azD~d zPK0YHh07CRd_xL1PTmQX4I{W5`4-sU5W{KZtKee8u)t1vpIi*uJ-&oICqE^(`s-># z04UaZdH2b0Tj>vxz9#<)($@{+Zp%xcYF&`(5BVa+pT;-JkC0$RqJjwNC}k+};kk9m z(ItxQ3bB(`1Xn1wD1?nDtW~Tb+etDoVmm zu9q;*jwoWGX+s7#D#{-&ZwOXpMY$;*1~fAVOL0ZciP{uJghZ6uquju4<3!G1Spu^* zCUWu0Mdpy{-%qD=CCW=?`pjg?*DBvs!l#>~Kxmx69Z|js2OE>POUjM#K7QU% zt^sayydpHZFj{yX*H&6|ZZvlFI*Rk7*F+2dLZLXi24-ze;x@RpDfxJB?1qp5;$ml3BNZn7Fpe!(ol-F)Qx z?80et)Y-G=X$W@_?li~xaFsmgtm;z+0^? zHkyhIChTB2KD%3?T)jy%O{cF}UaHB_R_P6^kbN@2&T6zP%b0$v11Zs4!P+uYsiw-f zT!Zul2R(gS!PJO+!d*d#SY5;{(WvvLX$&SE;jY4KTatpW4c0KSF=~o&zsH8IwQo)J z8|2D#rZJ;eB0LW=w?@+%SiV(B>tXX&1wKC<#e+f5UUHb`%W1RGEbK5YS*>&Lal&`8K>3l2DyVy~qU$|{%D2-wp5u)0k( zBLA^LrbJ&{sW&oHK6HS_(i&5VzE-C(nsDl?ko+F5wgsb|x3P5>@NSR8r^Yeu$@B~e z?TPdqXlsuSFCH;yc};amkx8q;J_W4-t9QYb_7IHJ+wDqv0X!g-z76p(L5#5C8pAR} z1>yhh@L+yHM&>LGeZtrM2`reMNBFf4uz1-j+{gKKLy*$4$`ZnFa3DJUn8yj8w$3QLDW3Q_o!OCt&4D`JHA#=Qv_P7lOwi}Z=dhYee3XN{bSD-#O0#i>O7GW{~b<6AJs zGeD>kyFKn=MPT1HHtnakg<6|0!ahf*5ngF;{?;~m;D6b(3|pkkGn(oe6We@vi0q7~ zyJ31~EZqyb&R|*&Pj@EJ^Kh&)EN#TtL5s4Bj3%{pHOxcQw%RjF%4>|Kj4Isf*v|0} zc-Z+ET?xtCq!OnJjm$EY=Fv<8Dt zj}~5e6rMJ9Hk-W9;OdT`P|KgVtlYwkY-I0`2g%N4N+5NoD%x{`-9Pqi;GKy!n{B&5 zKh*A2QE%9@GcI7%q`~p9-A1U!=9a<7I}_+8knBnf3QBkIl{Lmvwt*6E24wDvr8!WJ zkU;!EK2+Bq)@3xK(OQY z?0CM`v`}l%=M}NzJ0i>0RIQ;5H_O^GJiD;(GTm|{Kev;t5r%^NS!D)Wp+!~8Dl3d- zt1(~0`u2pP6wh!io{K-`+P!2&ik9J$Bz&K3g~PgMRlX1GI!4@hv9CXJq4(Kg{^EY1 z$uKN0Cj4vm`MdvYJkFD%%Rhn9(=hLtpJiSCwhbd+%mo%8n1Xu(17UHOJbKP-yB$;Y zS-Aysu$yfNiL1LrUuGiQDd_5o4Ssu$T~9MzYs#9PV?DvYhR?fHNuou$YTQ+fgg@ul zr0|5rb#L9N?$}3`yjLN)KL=*-O-6&)>{W&Ofsjw44aS=VAO_U_~DJD&SKMWPhn9fkYs3X05Z=i?3k~~~ey($Ec4F>iZSpdl+^?caxV}HycM86D5=T*E zBe#KfcM^JUVz-jM3`@HM=$o*jJ33VCBxg!yewML-1r*`K?cOkVD+4du+tKJSU9cse z7oop9K5Wc9yQ4Ijr4;1qJweq z{~pA3+LhIqB_QL#1|d&4dTcP?IMq&Zvn` zQtVRTEg^@ZnP!QS5G|)h%~d4DrAN9JId-MuEg|PI&EzHGdqy(09-%RK-(Zhg1P^KQ zQ0j!G;|fPnLIQ@dO6(bfkP{9PB`cpT@~1>z@d$4nfiF^%?*E%$ZinV@= z$k)UFz7VqXh$uITy3P(ol&k}|Eb`Vjx0ni($#~zuIT(6bHT9TS^AeWK6LJRcEvPgg zg_gsin8QDJSdRJkg~RfCmSyA154>AN1>5Kuh?mtsADl5>;=<;Q9JWm~lkNQDB7Y){ zAs(z4ysY)LB7a8Y-3B=(glA(R!MuTW@Q$dk{VzH=CGukGPPBi)dt*&rasiIN7(MES zR2=ePH&_*WxIUa|u*?)+=i#lx+Zt@%C_Mz%o-q6+CblQK{)RLZdkAEx7=p|p1ESO} zI_ObfTLa!z71L-*H)awaD)t&2Y9SIW8-25c$1~pGe{!nF6cAQBmPMTO#Dx zUpOEMlUrW0ava<}5?o&(ei0K;g1;9HxvY)-Ao8u4%i-QKgtbp+Alku8+C(1T&Ox5x(%VQn!woGcX;UKJH&sIVD(u{ztKZEdPs)O-WpeMyel0fMi3Z!=xldGKsRJQDVA&|rQZRAm zB`gOZd0uY;Gh!%k7N2qMjLJmM!|*#Jwh{2J=a@_O<2Ai`G373K%23Z?hO zw*G1*9Gc8}WhXkmvqLS%W$o*;$&6PPGF-um!OO}^G8oU!eEeq%RzUcPkkJEw=>?6b z`?9DTfU2wo>zduqydZ^&6QTIC=%y2LItC7%kUOz+99w+im_K}Z!j&F@+b6H65VXF0re2o5Z;bQen5rGAX{oBYmtra- zI`A{#%8RK{@f;UDgk12Jm0a*wYo@lUu;z2AQ7Vp)<2d8A_%R_I dXTEZBIHhCFTyGct+zs8Yw9pcB+UW}Z{{gb4p=|&F diff --git a/src/scroll.c b/src/scroll.c index 21647006..bcb089da 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -143,7 +143,8 @@ void main() { //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction //when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; - + + //right movement if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2) { if(player.d == 0){ player.d = 2; } @@ -153,7 +154,7 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollRight(bg, SPEED); mapScrollRight(spri, SPEED); //mapScrollRight(mask, SPEED); @@ -168,7 +169,7 @@ void main() { INC_PER_FRAME; player.x+=SPEED; //animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; } else { player.q = 1; player.d = 0; player.tx++; } @@ -182,8 +183,9 @@ void main() { } player.triggerx = player.tx+1; player.triggery = player.ty; - } + } + //left movement if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4) { if(player.d == 0){ player.d = 4; } @@ -193,7 +195,7 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 3, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollLeft(bg, SPEED); mapScrollLeft(spri, SPEED); //mapScrollLeft(mask, SPEED); @@ -208,7 +210,7 @@ void main() { INC_PER_FRAME; player.x-=SPEED; //animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 3, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; } else { player.q = 1; player.d = 0; player.tx--; } @@ -222,8 +224,9 @@ void main() { } player.triggerx = player.tx-1; player.triggery = player.ty; - } + } + //down movement if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3) { if(player.d == 0){ player.d = 3; } @@ -233,7 +236,7 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 2, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollDown(bg, SPEED); mapScrollDown(spri, SPEED); //mapScrollDown(mask, SPEED); @@ -248,7 +251,7 @@ void main() { INC_PER_FRAME; player.y+=SPEED; //animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 2, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; } else { player.q = 1; player.d = 0; player.ty++; } @@ -263,7 +266,8 @@ void main() { player.triggerx = player.tx; player.triggery = player.ty+1; } - + + //up movement if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1) { if(player.d == 0){ player.d = 1; } @@ -273,7 +277,7 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 0, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollUp(bg, SPEED); mapScrollUp(spri, SPEED); //mapScrollUp(mask, SPEED); @@ -289,7 +293,7 @@ void main() { player.y-=SPEED; //animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, &ptmp); modexShowPage(spri->page); - animatePlayer(bg, spri, 0, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); player.q++; } else { player.q = 1; player.d = 0; player.ty--; } } -- 2.39.5