From d7faaa279c10338717abde371577e1070033d390 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sat, 15 May 2021 20:51:35 +0100 Subject: [PATCH] Cleanup and tweak of player sprite/dimensions to make doors easier --- !TheEsc/!RunImage,ff8 | Bin 22344 -> 22236 bytes !TheEsc/Spr,ff9 | Bin 116880 -> 116880 bytes !TheEsc/c/Graphics | 2 +- !TheEsc/c/Mission2 | 80 +++++++++--------------------------------- 4 files changed, 17 insertions(+), 65 deletions(-) diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index 736ae3aad58d06c0b9325f22c903d6f0b4d3456a..d5de7fa3113023b1db969fe26017cca841c5a503 100644 GIT binary patch delta 2957 zcmY*b3s6+&75>lN2fNEI+yxd~P%f|vEGQrku_~|1Q{+`KqR@cW*c!y3(WrG)&?U}j zd>%zfHLU5Fq9cuFO=?Qg$^*=wFWZD$k_K)drTK$+@5~HTp7fqO14k@4bdugTIBx_cCRdm z4OF2S1g%dH>srg&#X`)1g3^EbGwC|Vqzax%KN^|DSd#lEk4FbY9}_*u1hJg$7Gr5H zLUgl^>U&q480&B{Hm7kVJ3%!6mF24#eJ7oG0}{ZADlP`vaS|tJza;16VM?6KS%NQn zr6Hn9_PUGhw)g)Kh&#DZUANbCKM>#Jra&X!<6^W+0?BCtXhO5%3z(0C3X5q1byP>t z^0Qk+6+avXcLZ9M0*t{TWf&OoC8c1}4o{clZtSSm4gr(Ef0ru{+mvMxhWC{5oEU(? zs&Kf2X(|in3BU!aIMsy!CaKV@3WIJus)_*@URE7Y?+IW79Zq~%odEA*n>rm{!(O!o z8t{=i1?tf1BS01Q`vhaHj~UkBI-hjN#8W8tS`{l}wOAFnl2E(0m>YV6eqssjkG_l+v^kMgL-`#mRh_vWkGPf**$sd_4$wli$ky*B=)dqri$SMgdHC z)R@RQsqT!Wa0w>_#LFlFA*vDY8c3$31th{+yburrZ8#WEY-p#Fx0Sckf?C8wSQHpz z+)J7{9uGO5>K?;b=uT`7EauKQ@k(Ggyz00gm<6E2Nv8FXipNaxIacb=*bb3n<6VqD zEOLCL3s_TMy{xB5YH4eJ}|%bUT2JO27=>Yx5E@- zQTZuJ6Lf>NA+_7LFn??`Omj4hJpl5)3jY&y;*s!q(1b(b-@$LOUzjt_re{(*wIJ5) zQnDVgiFnxymEP{o!-|M>?jt8|i-^mK)w3>g!+mLmATE>#cn8@kw)Uy&$W?YutR6Ku zVwgWC<|ys`K(^iyBl7#Rxj*cKTx zDUu9MU-GNY?uK%^Tfr*aL3Ot4LFKk{6U%L)**kDCmCo0AKQaZh7#U>&M*k43iCSg2 zBafz4$yNF`-ig`;f5Zk$EiA&zmQRS^Gd>ZPWA}IoQXHKV`~lu^d>lQUgRwXin<8h= z`q*gF(YZr&$hlL|JeM#nu9~}g9rwoFlGD9BJ{lSw`{R8$?tup1n$!yCF)g7C&R|PI z0lbZu6GGs96cZkEl$oy+qhKyVQh}jH!=$^p@(!_y^Kov{bnPtC_&)JSh1iy~3H%-A z$rg~akeM6@UAQ#a0w3UxwYKkG3%!NfG6X!VI zPyLUA>i*Q!6hoStO1Naikn9+o`VGJl?435xv|Yuz&X|vS=~$5y!sS22 zE2;DGlbjFX8gBS?%qB^}q{Y0=rDH8F9ZmZk$>&K9^2&5PNX3H974DV4A=w;mbH#e) zuSniN_GGX81<9=>&+y9ENPd^(e6RdD$;mXnd_)d)UnE68by(o-kVG$}PZexnDrU^I z#0qlwvO5oTD4Qo1>ZA#69OHy9PtXGI< z(VDl(oJ#4C^BT);nCQ+4jAfsitTbH$cISndV@FvzuhmS}D92#lOn_yWR#2<`i1w<5 zvExoWT(AcAqNxy}504d=K@tuXZlS|xL(wbrj<{bGGHK_(JW@}dAdaE3$r)qs52bfy zw#MGildq0ZRpFu9yM~iz1;Q1~n-v4u*f6V}uKAm@w!%VOSeyl`@JMkPl;B`-t>3{K zLF{O37j175-GML8en(qF_uW}?Y#AC#+MygfOX6Vz-Ylu+f*;_N(q!0#OG|&JvIfx0 z6njgz!c52fvN?y<+TDZ4}DGaXq9#H%Rtus|C8n0 pge}|Ot2m@UzCweCDmCMlU13Z^O;1h!RbXRWW{s*!Fe%}B9 delta 2953 zcmYjT3s93+7QW{v2?->Skc1FG{y>m71bGNsL=t%jQXr@-KA4628XrYbvDLL!u%ND% zsy$+5YfC!YcC@YCVbkea(H%RByQt{MY~!P=T}k{$Av)Hot85?H^GiCKnUj0Id+vGM zbI(2ZzjhP`KLs{`N`)C0vaFFc#!deo$VEh z$rgF^u)_;SFSaqJb1^ojWgUy4v24xiRz|;Q7hZx4xQ9|M5sqUz$15ICaH1NIb(}f; zwjb%pn1pS2v%QWHl@8zHB7?5^MRFbfg_{byag<9`v}-BoZy39S#(>MviuVJ|dMhoI znP~ggPC=@Eng&k+CQEq8#tKOkq~THtuaAFfF4NO;c%fn(m={9#xSOy?QUgB6&$U7R`$e;c#_day6Z4E^W|DuOoD2U{o+ zrNODNAJ+yaLL>GB^H7gp(flhoO8-S@RHiC&G|a1|#LIA4sgy-p=7)^* zPOZUhsyH!eDqf){!{SOCo>!&9KXF`@%9UTngpd^I!`cu7e2ObVvf+JvFJw2D}j;RZU&`S6{PEkim){`TwRZqfZ^(uG)uc~)&5o%ndiGvdC)bNmr zA89O{mFiAY4YzP|SgPnH%pjepnr6auXkivWJQJ1(U*P?)O4V^H`3`$8ZKzZDD^_R| zHAiV?j?YJd=XfF*i#&qu+Db0og%`9j@Rswgwg_M{rt3FD4Ia^_+Dd3WV_gEr;@wRB zp1`SN-N4#zY!~M#lM1?;{|zCY>RZh01Ch5*%!}*qp+5Xv(9Ua&O}oSx`56mOflr-! zgIOBVLKmuyW)BgS{~ODq6QIu79Q_W6_bTRH7{m`^>fsKK$J~OAIKt1F)T?CP*+e?l z?v}6t;a%dzD5Oet5XwTx3fDnkmD2zd_VmFcrZ7k2L6Se z88hJ|p3gAAMHDg~b96G_S>m7tA#nzU(n#X+iV4FF zf%u&@+&PqUGk}V}FF#vlmr)&8O-QSp_w)Y)Z~}*4sMmiiW&MLSBv9`cm_i)egyUFP zuu9zOCk5XI2ALe5G<7d-4b^8v&{LqMD}ErP%}o^~C{4YBoWe0kC+@gO4(tx~U{Qze z-s_>^CY@hJs+v&AH}OwZWTbLK1`Iot2(jkHJnwAc1sUaC!?xdk)6NTG*Aabu zFJWGFOE>wh_vjh>V(6hcveW6ciiV2LwR9IfD(ADDV!u3l2Bi0 zElkS2BYEa!`Ag5dyj=Ut%Q3$fsjA+iBQI~_aG_Q?#c$WPZs|*?Da=+fHAN&wc-Zfx zTXZsadi>HapL1ee^vp@g>}O84`JE&V)w|WK!7L|7b zI)10ESXCGmvdS-ErW>9UVK}uY1}{#}p_;2JGSA;YVMu8CZZey}@1c(4@F4N2#B;>& zB|eFGv6#AupG>^Cei!k5BBl_kX?%^G9JKa6E!R!NhvIONHhtZFpEs6PY_T{zb-cr~ zn();heBOBv#lD#7QPWGhQVf{za@1H2ss_L0rw6{MS(t0Jh*xNtb*e3m0)0TL;biVh z6J7SSZSE|!!}C8f86H~W&Z4<+!d!H_`!_WAA+60P(;KZ5#hi=Rtp+anAzsLtk2SWh z=&~qgByJrIVBRI_4tEgibc@v}5FR9~^Wzc1m3)Ug#*eQPHpXIN!V5X20gEuiZu|8?G*;&`tN<- zfl^+Gpblb-aEwIK*Q8bM7zx9^3a$RwJ)d`w>lJ=ITOXB+6R%bzLO#N*Rj?eJXYHWI z|7cbbegEWE)<70^RyKz0ZQzB&Exm%Hmlu}o!5=C=Rt(ZBmqvkI!4F>SgXzu^r%5EP3 diff --git a/!TheEsc/Spr,ff9 b/!TheEsc/Spr,ff9 index ac8597649eede15445ba635eff1f38943a3c4aeb..5b8cf8ce098dfbefd0fb760f629a15fee30bd692 100644 GIT binary patch delta 273 zcmYj|F-rqc5QH3&eY3;TE&s%+4mGaxyBP-6FIwR1a90F-Dh4x)@^&htF8{3()*X z(Xb~LeUI4&ni3BxG8ry$tBZL#?Ym(5Z-+8Ds26^L;|t93>IRXhZeTy}(S*FWt319# z9W|a?MBGl%;Z6$8EQim;!nbcJuHnMgul%cqUQH7(SmalZfYnFrNxZtwafT^wzM?0w n=Q}qm`-8|qo4ZfwIZ{qqRK=0s87>`F+*3nT=g_X@I0}9MVKQS> delta 279 zcmbO*k$u8M_J%EtyxXTU?qw97uCSevn>!>vgn=Oh2;$=*q78=`xtQbQL#AKY!zj1C zWIJO9)8w;x;?oVR7zHQSW++Zh$Y!6cpNUNKOg@_~0TdUWzMz|tfBKvaj8c;Wtk|~S z-o+@-I5~kyV0yt0MwRIY4l%M!p8&LUy6qlD)9DkoGV&nAw)gH~e9MR?h)v;iphC&% z6Am$oO%})sn!exwBikf1-svAY7 sizeof(fullmap)) { screen_nobuffer(); - printf("Map exceeds %d bytes (%d bytes) object type is %d\n",sizeof(fullmap),length,outreg.r[0]); - exit(0); + while(1) + printf("Map exceeds %d bytes (%d bytes) object type is %d\n",sizeof(fullmap),length,outreg.r[0]); } - + // Attempt to get file info inreg.r[0] = 16; inreg.r[1] = (int) filename; @@ -191,6 +159,7 @@ void game2_death() { int currentstart = 0; int introframe = 0; + sound_voices(4); sound_set_voice(1,"WaveSynth-Beep"); @@ -265,20 +234,20 @@ void game2_setup() screen_clear(); screen_flipbuffer(); screen_clear(); - + TilePlayer.location.X = 102; TilePlayer.location.Y = 102; - TilePlayer.hitbox_bl.X = 0; - TilePlayer.hitbox_bl.Y = 0; - TilePlayer.hitbox_tr.X = 80; - TilePlayer.hitbox_tr.Y = 80; - + TilePlayer.hitbox_bl.X = 10; + TilePlayer.hitbox_bl.Y = 10; + TilePlayer.hitbox_tr.X = 70; + TilePlayer.hitbox_tr.Y = 70; + TilePlayer.drawbox_bl.X = 0; TilePlayer.drawbox_bl.Y = 0; TilePlayer.drawbox_tr.X = 80; TilePlayer.drawbox_tr.Y = 80; - + TilePlayer.direction = DIRECTION_NONE; TilePlayer.facedirection = 1; @@ -545,29 +514,12 @@ int game2_tick() draw_sprite_flippedhv("man_se",TilePlayer.location.X,TilePlayer.location.Y); else if(TilePlayer.facedirection & (1 << DIRECTION_N)) // N draw_sprite_flippedh("man_s",TilePlayer.location.X,TilePlayer.location.Y); - else if(TilePlayer.facedirection & (1 << DIRECTION_S)) // N + else if(TilePlayer.facedirection & (1 << DIRECTION_S)) // S draw_sprite("man_s",TilePlayer.location.X,TilePlayer.location.Y); - else if(TilePlayer.facedirection & (1 << DIRECTION_E)) // N + else if(TilePlayer.facedirection & (1 << DIRECTION_E)) // E draw_sprite("man_e",TilePlayer.location.X,TilePlayer.location.Y); - else if(TilePlayer.facedirection & (1 << DIRECTION_W)) // N + else if(TilePlayer.facedirection & (1 << DIRECTION_W)) // W draw_sprite_flippedv("man_e",TilePlayer.location.X,TilePlayer.location.Y); -/* - if(TilePlayer.direction == DIRECTION_DOWN) - { - draw_sprite("man",TilePlayer.location.X,TilePlayer.location.Y); - } - else if(TilePlayer.direction == DIRECTION_UP) - { - draw_sprite_flippedh("man",TilePlayer.location.X,TilePlayer.location.Y); - } - else if(TilePlayer.direction == DIRECTION_RIGHT) - { - draw_sprite("manrot",TilePlayer.location.X,TilePlayer.location.Y); - } - else if(TilePlayer.direction == DIRECTION_LEFT) - { - draw_sprite_flippedv("manrot",TilePlayer.location.X,TilePlayer.location.Y); - }*/ #ifdef M2_DEBUG_HITBOXES draw_rectangle(