From 1f098b9e6ee7c589e2b1c59c4184e8e09007ab85 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sat, 27 Mar 2021 20:31:10 +0000 Subject: [PATCH] Move some hud drawing into sprite --- !TheEsc/!RunImage,ff8 | Bin 15228 -> 15020 bytes !TheEsc/Makefile,fe1 | 5 ----- !TheEsc/Spr,ff9 | Bin 43988 -> 60384 bytes !TheEsc/c/CTheEscape | 9 +-------- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index 4b07c6320c152cad3275584cde30afab63801f65..568721b4370459d6b10c5679d2c2cbb9fd597b24 100644 GIT binary patch delta 2913 zcmZuz4OElY8NN3pkc0#hLLec81Vy4E5=E)BD4`y;NUNyToywVK73!H2&+vC!)hdqF z*>zQX3(mjtY1h?O-KMCmC{sIdY)757vt3);nZ&DN>`Kp^qy98|Zus1CcJ`g~=6j## zect!}-!J!9?q8A1m=cs`Vl47I6N^|G`?7x=V~075JxvF5f50bYn%Qv{P{LZKgq_JO za@Dgb#Np?{55m{L&w>9r`~>(e_@Ba;dI$V+iD`+(MtxjsmFh(*!$71n9Am=nCd>YKbSbPYW<3Ml6;LN9?`CUu3^ z!7fG56Q67fy#V%msKmTV5Tg!Ol`G){ixU1EnpKF^QgecB_D4XEA|nYI%fQZ!%SiX5 zJ~GZj^Qqd_LTF~hX>`zNpy`Gt=P4yzi+H8%%h*mZV^CRx9@c;j#AS_EvkpVEK-El# z<`JsU+Scv^+oZBn!H)btnR}o)s%pxhkt^_Uq_Vo~_cmy5sG2d*WXEahppmn&8JgjU z+5a1x7nDIQf*TPmK(Mt)3G3WSxXr*K!+_TSzlAu@ZVYV)HyhjZ614fU2=j+6dut5U z;N(=#XG*w8<^ODCE;o(Rz0UP?Nw`Qj0Za9<)NjVJ0e>j{ zzyQxIyTnE6O#BV6r^QJwW8DeHyd8}7ze`(^hVxgbGik6pq-T--h(J0glukWT3xbUQguyAuKcJB>2=v@c7r zIoUzWO?leY1HeuPO$F9PN$h6zF~+nQ%VoUt=nIpNk0ZNz3jZ;E+g!|7QnR_(unPQA`+XrpB?eh*lRc_RfaF8A|T*+N)4Ys8#(iIwo> z3h7Kr_%U)?3%HRcS&OY6v?Q-0rO6|1E%AtN(MGGU@F}VOPjAeP%Da%gdyPnQn$A81>e z%WhKh>ag$LM_yU72lMsEv;y;eAlZL;9iAp`vuSSYDZ}=n`C?pPE4^jg#J^9a=@a=p zT9clsYv8RYuq}ND{}GL~7xBgPoPCF!{ETv5LKPV`@ONcQPp=t(!#y-z=E7 z;z|=wiBWqSo;!bR29L%Lz`Mi#{WmWMm5?K+ROYgf1cq=_{c{JgK_MGez&dX`G zyPSKe#a+d96mdc6o(ombE^&Ss4B6Lvqhqghw>c8=jBk zVtHLNW}-Xtz?%X;vHOuXO~qQ^QNUAGtOrg5o~&XEunqWe6{iC`fG1F|w_wr*4U0^d z5w8+FvC<>tJk7;CO~rIeUoQ0TJxZAQTg7&0Ey&DQD=}2MwLtE{XL4O;m&!VEA=OZ0 z?jrMpgn=GARK`hZgQk^Sku0`OY%GYB1-iv}OShPScRAkm{HUm7>p~9phQQ6!J8*MQ z>!7LQyS3~%zIWjsbYz63P2k{!pIwSS3wZ^lb@!qXibf;j@IG@l8o7q|GGq?T z!fNr|f?-}+ps;tG5jgIYOQTO3gYPkR0abqcD|)SXy~g!H`=Bv1`Q#Bt7`p{Kdz!HuU5sh)PgPjpU45y?G#B;McA-ZA!2LXN4OvAu_YVe*l6`e3(V{YPl`qjTG@mS%G*d(7fL eae%Q?ur62+>@4g8>@Tpt!Y;$Ez^=k>!2S(mUwsS! delta 3092 zcmZuzeN>az8NW9skc31NLLf251OZb;Y7n(WQ9{)^4OOdPtEfi{RBiF2iq@@Kz)?R| ztLOtvk8?&>C(e%@hPqa;sFmY(&eqZHv^$%vYZ9*=MvvNBb$&Ga-SD#U$KG?Eljrw) ze$VsXkLTVu$JRVvo61-qD9ylFBy3<2Gh?^5;&J3<`(^YDZ4Rq!XkzXHDxd>{PF@TGnn{4$CA?FikaAh+n20DTU0lbTf)<07Cx z_yXZiz=&9Uj%0wY#Nso7?9&3_^I*P+#ixR41^P=YF5lZYJrF(#=29#^7R(8tbFuhH zpb^MF4CaGad>EMBK+Umu2GB#~?*Vf}#*I!eeq`(db3kg$Rxk^o;r`mt&%o}Mx-0|O zRTz0(VQuJbuseX6I}pUIgZ}(LxQ_`2?k&W&(9S-V;>UUx8H0>?WUK~T)hi>(i~7j; z4w}o#yOu(;wwFc&jS8CU&}t^W~C(v9VQs?lxcLrAAjFVm`4N8k6IW$e_k*1{QbDH_BYD(;tK z7jZ1YS#2olV<8PI3g3!G&v=_kx=zx8e&6tF+GTyVikt4pXS)O^h_8ec5;qL@I-51X(!(=n#^_L z7_Sq|UGQ~0)_5g86x*rUX5m+;!{$<9Tdvt=@(RkeJNOwYwtM(x+F&n5n+5F-Yn>Wf zx2eJD=R+yz{LVZYy((`2#@-VeY|Bj&155aNDsas*H>K_rdhf=N>^YNg ziDPug^*6a$ZpVvnVmR{98+`9ry~tawU^Q?y@CpTMffIpWSFj1#0=!tkNx(MXQtEPN zPWoQOB9$`Y4g}lQx`bS(xmc$aSVQT{jsDmb2s3Y^XouE>Outfzq0)_4We?6tbr^jL zYsaPZ8r7t}ZXBdAHifZM;-G1xHIhZ^#O8uXp07iUGj)jZ_|3;}6F)7=Sarz84hh^m zUEMbaH4d6O?z)<_$}jy*3}l#Tzreu>%L(W(U={pt;U~bC-F^#xANW$wmN>d14h zbqN)wp@aU4X~|E48>+iAaP&+KqI!x8tx}IGuR#=pXWn`-3EB&8d{c&P4Edo?SNH<( zU8o^Bm%`IS9tjy`$xC7Dx3sT-dnL3;iY4NE3t-2?nd$c9GC2fU=D_T3acdj zo|j*fD~187p_lvs=!ZaeRME-7^k^P&95eS9v083u4l0^W?yByY^a$@j_^=;V!E{=@ zBe%tkD-gvkNNP}$3~qLL z#fs8ymrY!{x^mI-(sKC+FJmcVi>Ww0EjRyBG_pJzjacw|;9)d!9>21g+xnxG_yNJN z>CBha^(Q@WuOs{cHK+TnFOPN!t<5ETrk!GBCKTs);h2~+-qk&j?Yl4#?xaH*nYg(= z&3J3}xzrs8RwLfN7mf5olWoBt+rub3Tgs-A-ZNM=&)71; zGn;F+;RAS*-g{~m|FR|cRJ&T0*GdPoUQu}6(~nf?A5q-!X)0f9%k1GZRjR^P`c3vO zC0;P1U7!0gV`Zo^@i6IgHmdG@*0MckCNDg9im~d`jHO>-%-6w~3JWcgsMz4n%T2kHqU+k%M@PcT}Jc`9`U!^I7e{Knr7eFds}lvT7}C3vAnI;$!Bv%*Y+U m$&{N%6=O`^87CMkg1roz2U`d$gDrtoz*fR4Ve4S)VgCW#bigJ6 diff --git a/!TheEsc/Makefile,fe1 b/!TheEsc/Makefile,fe1 index 5effb70..944aa5f 100644 --- a/!TheEsc/Makefile,fe1 +++ b/!TheEsc/Makefile,fe1 @@ -26,11 +26,6 @@ Linkflags = -aif -o $@ # Dynamic dependencies: -o.CTheEscape: c.CTheEscape -o.CTheEscape: C:h.swis -o.CTheEscape: C:h.kernel -o.CTheEscape: C:h.kernel -o.CTheEscape: h.Sound o.CTheEscape: c.CTheEscape o.CTheEscape: C:h.swis o.CTheEscape: C:h.kernel diff --git a/!TheEsc/Spr,ff9 b/!TheEsc/Spr,ff9 index 6855ddc0ca73f1f3e82cf4b17c1584378c029c24..32b7736795096140b10660ee051b8651f8b7b169 100644 GIT binary patch delta 3826 zcmeHJOKTHR6rP#9rZL)x+9Xu_P^q{OT!;k~F(M+-LcxuT0b6isl)&T{xX?u)CMPSg zzadC);jTNuog#Fbg*y@R6FiSQdER+sl)CAqGiT=9d%y2IzTD3D1FL_K$QBL5$m8|n z=ZEa)s`;|_t!mx2a(CcMb=9^Epcd1P#{WHonL2Y)XFUcj*C!@%*0UWAb+2>hH5JS=vB83z;|0ayO6Z|tG) zUeTxGorvAPG{ODX{9?3wu)ulO*I=}sEO?ZZA5()>;}Eoj2Bcf$Zx@d(co znjnsNc#bF0H|_4mXPs4{;A5MKg_-20WF&#`{V!MrSphScs9w-Vtp6%k51o)D5tTS) z$aKokBu*)pghO{-t^v}*g9p#xntMsNFM_0xn>t1kxE;WXN2rePe3<_D_e%dXYVL*( z;ARMbS3tI2d8Kx-F{Mq^jmbaiPTV*#Btql%j)zIk*q9822sAuUdJTwk{uV}%jPCUF zd@)YJ8(}?HxsK8v{*L@~|0oO+i$-ubhSn>rxM_wxtbsE+t!_mlQ78=SaiC>sD0X_q zR8H$y9?rp{vJnO9k&_&1dZ@@ zi)ST$iZ0-1=k65ti9mm;brJF}Uc;be!{tT;pV!*WBwT-b3Lp1izq5t*S-Y8nPt78( zdIzg5vhUFrdV^NQgzZcg`i&%9ZRFd{G(3O1f?GCl&0|_~_%3AL`#;Q@T#thBQvr*o Jw}0z`^#>-D0w4eY delta 30 lcmaEGo%zajCN6OX1_l8jzOi~E*YVuRcUMbnewq8)767ZY3~vAc diff --git a/!TheEsc/c/CTheEscape b/!TheEsc/c/CTheEscape index 2651acc..fa5f7a2 100644 --- a/!TheEsc/c/CTheEscape +++ b/!TheEsc/c/CTheEscape @@ -21,7 +21,7 @@ int lastprofile = 0; #define PLAYER_Y_START 100 #define PLAYER_X_SPEED 10 #define MAX_NPCS 5 -#define MAX_STARS 5 +#define MAX_STARS 10 #define MAX_PROJECTILES 10 //#define PROFILE(X) lastprofile = clock(); X; printf("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t%s %i\n", #X, (clock() - lastprofile)) #define PROFILE(X) X @@ -875,13 +875,6 @@ void game_draw_hud() { draw_sprite("lcars",4,DISPLAY_Y-180); - font_colour(colours[lcars_black],colours[lcars_violet1],font[sys_12_8]); - - draw_text("Shields",75,DISPLAY_Y-62,font[sys_12_8]); - draw_text("Integrity",75,DISPLAY_Y-92,font[sys_12_8]); - draw_text("Velocity",75,DISPLAY_Y-122,font[sys_12_8]); - draw_text("Distance",75,DISPLAY_Y-152,font[sys_12_8]); - font_colour(colours[lcars_violet1],colours[lcars_black],font[sys_12_8]); sprintf(hudbuffer,"%i",Player.shields);