From 31aa7461bc050c46c1345ebeaa9709733e3614ed Mon Sep 17 00:00:00 2001 From: KikooDX Date: Fri, 15 May 2020 13:56:31 +0200 Subject: [PATCH] Using dsubimage instead of libimg --- JTMM.g3a | Bin 77780 -> 76468 bytes project.cfg | 2 -- src/draw.c | 7 +++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/JTMM.g3a b/JTMM.g3a index 4d3da453e9d16b49afe4bd7095026b7616e065e1..1c70d3bc1d0e6d15d32cc3be51ecd430afbc1a39 100644 GIT binary patch delta 2617 zcmZt|4^Wf$_5Hp;ni!xFFa#_l1ZqK|`AM;+Cqq!G9_0=cJR)NbZ2~%}gC^SG(!mC{ ztfYwkJjFj{S!I@Xl%#xsVMni7+hcUcx@6Lf_P87C$z&UM<7Vbq*Mq$;AE3M2mwVrP zdH>)0z2CcU@{bXNpGRcB+xLOHv+dd&cb1p%w+>&QKhNNirzK5B$ix4?^jvsj6RReX z60&*lLiIh#)7zin50I15$a{<*jX8U)X~Zv6rk0{fC(se?tTt?{McOk9^`a*_;-4iC zX#i3xQwoY7Bmj)4fg(wFPXjG*AWjEbsYI9pDn(j==pGU8?lHVNlW(|uyv%URFnn^4 zVXTfHYIu)uDTB;xwUT%?W!)<+%mwPHzL{?0c=MSvgp-EY^vieTj%I+z(NBnZ?cGVz z5KuV{aHr>jTtSv?7UV!RHlR1AS$*S{XNwJ&Yfc$%{RPA@cfk;>D>M9g4oY-io@km1 zoH)ftFP(c!)A+sU0)?jb;#iTqNS-~a$zZ`o&H4em(x^Pol`b|a=YY<%-($Yl;#tz! z%nfI2_;%tNwXnA5f_vNj7G`bUw=ls|BvK@*+(riJ}pXSo@S+pVbm7~cL$ zX<-_jxrHQYQg^8T1e&;gGDB=2sX(z$=Kc=I1Bn(^pfI7`vW5tE zi8eME=XO{a@d@p{>I0fmjCew9b0-r9OqUiuMbFrvPUJ!qC}A#w|c(s<^b)> zz39l33In#elNCC~bQ|xAnMp1IEHC5i&4}~28D}~LXK`Z{)4$TP-H6;ppjBvi#0#{# z3+ORBP_qeWjS=W^HP91_Ku=BqebEc_`&~dA?CkC<50Wy!1{#HIc_q-NT7hl~;ZURV zr|$BhAO3+HLbe>cq3BzUhcO*EtBzd@0J}cDDm>SK9vsb&5bjEe3~6jw88)W`ZORZH z!v-BR13fUfYbLB?;qp>@)6Lz4yeqIDJ}@9F=y*XF{=d$-BV@oRp%rmxmZkmW0lxQL1Z-veHIGi9j{&| z->O0tWDE5P(||n>-*rL7iuqgX5t%qFC9HK(s8QDZL+%jFWZ<;NHNg!og0h1FG#| zvd*t!=mOAf`3P9WHWyp$9OE>D%y(fkB7XjYlyIqYEOhZh;$nmBexl2%icd$#7z{U= zVvUAzptPCyU8>}CS)(YUKuvzcdZ33p5o0?KmjcadMO@Evulzj{yR_fIXxBYrWa_I{ zQpY>5?jyJjC$Amj@@qd@f`phK9B2_BR&+b)U{)y*+<@$j%o;0-Nvo`8A>v)UyXy zOx9$~_f7(T^6ed5iXdBaxhBVau~9>2-uF(&st+-o7&;u*{ELq_7*Pvnd&vA~LVRxD zUczO5&0634Xx+|v41j8wXK8;K$zeVHX(Wn`_iOMy*PoUcRig7pG<{=uDPK{0zbT?* z6X0qFnis{VyW_YfanQrdWw;lkV6%t%5GE160Xm$4Fd^QPVeIel6v8wDUXZh2X>%YY}%L_z=*??Ulpyf_QO;a8Ojkx#$F&FBuT@hpT`0T>-F0C z=8>gHsaFfM+{m|n$Z@N*^H<#*=Z#|ePm0!6VBW=MRGDYZ|MQoh{Nx`bEH0l1irW6M zBT_-TVv#w2eenN~(_?Gg-0|0?f?0VNn;7rlD)g-C(*e$_<(0pgk;sIbB|L25x3#!4 zOrKTYh2=ME7%-&suDySx)slJYo{pp6pJ{~jw`1QV~%ak3PHdmGzJfbO+|QGk%Rjb4+1c Y;IBSNV_v2!@dh#wlQ+4_2K*ZQFZLTO^8f$< delta 3996 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 xM|Mw;z$4EOJz+eeNCAX$ne8#3.". For example, to specify the parameters for a # font name "hexa.png", you might write: diff --git a/src/draw.c b/src/draw.c index 3491988..513f994 100644 --- a/src/draw.c +++ b/src/draw.c @@ -1,6 +1,5 @@ #include #include -#include #include "draw.h" #include "shared_define.h" @@ -24,7 +23,7 @@ extern image_t img_semi_solid; //semi solid texture, 16x16 extern image_t img_teleporter_0; //teleporter 0 texture, 16x16 extern image_t img_teleporter_1; //teleporter 1 texture, 16x16 //animated textures (elevator) -extern img_t const img_elevator; +extern image_t img_elevator; void draw_player(int x, int y) { @@ -71,8 +70,8 @@ int *start_y, int tp_positions[]) dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_semi_solid); break; case '^': - img_render_vram(img_sub(img_elevator, - (step % img_elevator_frame_count) * 16, 0, 16, 16), x, y); + dsubimage(x, y, &img_elevator, + (step % img_elevator_frame_count) * 16, 0, 16, 16, 0); break; case 'S': erase_tile(x, y, level);