From 82089bb78072ba724442fdb6769094b95816a6b1 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 20 Aug 2022 19:11:59 +0200 Subject: [PATCH] Empezando a trabajar con los enemigos --- data/actors/enemies/bug.ani | 10 ++++++++++ data/actors/enemies/bug.png | Bin 0 -> 1214 bytes data/actors/enemies/flying_eye.ani | 10 ++++++++++ data/actors/enemies/flying_eye.png | Bin 0 -> 1522 bytes data/actors/enemies/flying_eye_horn.ani | 10 ++++++++++ data/actors/enemies/flying_eye_horn.png | Bin 0 -> 1591 bytes data/actors/enemies/walking_eye.ani | 10 ++++++++++ data/actors/enemies/walking_eye.png | Bin 0 -> 1237 bytes data/player/player.png | Bin 7754 -> 7707 bytes source/map.cpp | 21 +++++++++++++-------- source/map.h | 1 - source/player.cpp | 4 ++-- source/prog.cpp | 16 +++++++++++++--- 13 files changed, 68 insertions(+), 14 deletions(-) create mode 100644 data/actors/enemies/bug.ani create mode 100644 data/actors/enemies/bug.png create mode 100644 data/actors/enemies/flying_eye.ani create mode 100644 data/actors/enemies/flying_eye.png create mode 100644 data/actors/enemies/flying_eye_horn.ani create mode 100644 data/actors/enemies/flying_eye_horn.png create mode 100644 data/actors/enemies/walking_eye.ani create mode 100644 data/actors/enemies/walking_eye.png diff --git a/data/actors/enemies/bug.ani b/data/actors/enemies/bug.ani new file mode 100644 index 0000000..43ce4bc --- /dev/null +++ b/data/actors/enemies/bug.ani @@ -0,0 +1,10 @@ +png_width_in_tiles=6 +tile_width=16 +tile_height=16 + +[animation] +name=walk +speed=8 +loop=yes +frames=0,1,2,3,4,5,6 +[/animation] \ No newline at end of file diff --git a/data/actors/enemies/bug.png b/data/actors/enemies/bug.png new file mode 100644 index 0000000000000000000000000000000000000000..1a474951433d6faa40dc18fe04487b5eeb702deb GIT binary patch literal 1214 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 YpK`!c`!6uB8UO$Q07*qoM6N<$f^B8!EC2ui literal 0 HcmV?d00001 diff --git a/data/actors/enemies/flying_eye_horn.ani b/data/actors/enemies/flying_eye_horn.ani new file mode 100644 index 0000000..43ce4bc --- /dev/null +++ b/data/actors/enemies/flying_eye_horn.ani @@ -0,0 +1,10 @@ +png_width_in_tiles=6 +tile_width=16 +tile_height=16 + +[animation] +name=walk +speed=8 +loop=yes +frames=0,1,2,3,4,5,6 +[/animation] \ No newline at end of file diff --git a/data/actors/enemies/flying_eye_horn.png b/data/actors/enemies/flying_eye_horn.png new file mode 100644 index 0000000000000000000000000000000000000000..d2a3b699a9b15f7edba8b4967f39d8fa6e7997f2 GIT binary patch literal 1591 zcmV-72FUq|P)AHIP00001b5ch_0Itp) z=>Px)@kvBMR9J=Om}_hlRTze!X}2xymM*2OAh5DU2-E@!8YO~N zyKJeK7~f=)oipeCzBBLpoy(4d4kyRHAmmtByRYkNl+@o1MO6ZzG$)TWfeR8zIBQ=l zLWwv4bFY7y@?6Ev;^_i_guM?E*lOq#?~Vv%Ga(jnY~BVgc}k=Zm|>*T<;qYLrrDfEna? zIPJ3uEjtZK$Cr*b%$~c!?Q;XhrOXU!1?ykH7wOF^hs|zJ`%ImI`YT=jMK`}P{<&Jghes~} zz!weT3f>shcw~>qw7pyINNLL^zu6eFF+mSsq&IaBfIkK4R&E3R;(4OC@g<_Bfijt= zhbQJ|Q}9>qzOJiLIx9Qz`mYm=$F#g)6v1Yy;!wM zGcy(rYx{=25<7xj{Cwja-ExP)jEhyPQu3?9%ZjXx!R>P!c6xFl@_f$U_8wSTF2aO6aec}}uwm_xi&@ffOr&7lsaz5i>v!L>Uao%XDenhsl=`c`>E>~ZHk|R@gCFT^VQx~pnvB6628fb&D#K| zUSH2QuWshEPxk=uRMDS%!qVO*X@~V80iam&0qBeNQIJ=_b7SUU&9!Lx-)}pr39ldb z?(!NjxuDGOF6vQSfAV^zuu?Nnjgcb6;flE;oJgSLN}TAu$lRg_SR$XN$LVC#^m#mL ztz>C$Q^u+Pv2CXC#`~Bta*9E~(_QCi4!GE-bY|plEv^;|8#ZEpd?qC|69Mp_ZpG7l zo}=%)%Z9)ug8{1eKL*;72h3Zsc^lR1>*?{#)8gJdu$=eaeggn|P9ctA<)-hl#rB9; zdE|3|l>DtbJ~1u8-Q_hRs@wr!>Tm~V0&R@UD`9!}DSDhvUVnJL)>m&}$}x0N_etr4 zk{P1a-^qmhGHM=pTARX17FxrdnY05yu&1fc(a#R)_usvY5Q^1&X$%9a|j~I zhwXl>Jo33Fyjgx;YfRy+@Sc_cUbjvXcLHqy%&wSD+qAU+tgT$g)!tT)$X7DHJJ4T& zE!z)>WVCEQAl@99u9=|cdfT7XE;Yv8_{rRJ`)7-7t0!wQ^nE`noh8(zD-$0u^U-2T~F^S9U@Nzu>M_`PV^ejvL)k3$tuKJ|On0%pr+5CVcxM3p}j?qCcUs(vW~ z47LJ>T7l_A$d>z8K+Uf=;9kalFZvC+0@B6!Ck6aBF&OBncrznf(NA=4kC@ p_7houPciE^#7{B*84O0hKLCd?((sLX66F8@002ovPDHLkV1m-<5kCL` literal 0 HcmV?d00001 diff --git a/data/actors/enemies/walking_eye.ani b/data/actors/enemies/walking_eye.ani new file mode 100644 index 0000000..43ce4bc --- /dev/null +++ b/data/actors/enemies/walking_eye.ani @@ -0,0 +1,10 @@ +png_width_in_tiles=6 +tile_width=16 +tile_height=16 + +[animation] +name=walk +speed=8 +loop=yes +frames=0,1,2,3,4,5,6 +[/animation] \ No newline at end of file diff --git a/data/actors/enemies/walking_eye.png b/data/actors/enemies/walking_eye.png new file mode 100644 index 0000000000000000000000000000000000000000..476f379d2dbc521217dc0c3df4b6ff3fe139a28f GIT binary patch literal 1237 zcmV;`1SAHIP00001b5ch_0Itp) z=>Px(k4Z#9R9J<*mQ8FER}_W6AvR``cyI`b6%ogRCIN{gRkEp6XHzzXE-PTcCfz{` zQnILuD$zfw8zfX(2?^SrH&NAQpCDDKRN0GeKxz^cFlm(pY8(?hu^ms1?Yu7hBV*5a z#+ks8-ooQ|&b{xvJNFK}M!X2ki(0%X4Lh;-B5&KM%fRLV_QF6b8g^puMczg_R=Kv5 zFyrrq5k?wzV!w&J^*H-#1v&!nHHv{*5>~M?9ki|Ue0h0S8oT8+;_iueMmLxW^ovxW zUt}(x6G8~lD2ZmUml}3rzs|hPyxUhTpm&4m@c~+fMrj!u1wgxWp3dXPjc-v0>G1*5 z;{!;Ngd|C%#|N6?+ku_fR=IY(b68EL^~YZU$Xq;U`2f{u85$*1N@O>XBxzT?_D}@v z()mhk`OYs*@$KdfjlHY90g1JBLxIBLeQv({wrQY4LdAYJyrh}|Z2Tgh9c;#g`@6Cq~bv2A)TlEeo4n`||>_uqaaF`frRKsilThY+# z#a4Jm^UDqwtj~Z(-mx+r6lMd-%Gb-vbWoJnZur$2dN3=1-NvrvecJ67>%&JxD$p;& zWB#VNR=ulhthJk--T0Cb*-7sDPbAjXdF#T2xrhglU@anBC~P%3jkg3 zbOmR89b)wQ_uQVk!U30qGhGTJvJ(Jz_;J(Iuv|TTxjY_4Zu$}cg57T6^|TV`au+q@ zDNa9%nQC0~b%+lNI}9J~0x*p|Wnby|u2$|0UOTKG-PFdI(-FfQ-sWKsjC z<&UolA}$9Xmdsy`s^DnR-8VPr6(?Oq{U2gU)O40<;A&FCqsW%>2KXitW74bej;9qh zsaei*ZqO?L-tX(=gi}Q=#eEP}b@%H!;qUR_r&KM9OlWNrO1~Q+*zFbrj(sSl3Obn7 zIO$bbb2^xfCvmqQfLy-vHdQAry-0JU#-M|3E|#)+LfXr^Shdw3>~@PbmxJDX0bCB| zV@bXm@Uj|Jxs%ASwVlPI$Vkuhji^5R=MVnnRw5$-V$!RywVmaO!G+f%re-+hRRH)o zSKy4(!B$jdrJz4TbT7aieoT1GPvG9F6dv=7tJbPtOl+h`1^O!w%I#)Ec0#$0m3nwJ z@ARV>i^mS*@A1@$21=`p)u_sHu3#8jO=|q9W{7J!!toStPaBsg8oTgMoJfAB;UV1N z$IK0Sxs}LpVk!{I7~cN_;?Qj@_D<+-00000NkvXXu0mjf65U?l literal 0 HcmV?d00001 diff --git a/data/player/player.png b/data/player/player.png index fe0808be8cd783f1f9d510dd55833d5569d69487..9fe837a2cd911ca88e7903817fbee77be965128b 100644 GIT binary patch literal 7707 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 sKT6~;T706koXh)CbmR<9A!OVsED zt1s4iulMu&=fl!1z0%v%7!dP_@H$(^Jco-dxUMLA1yCu7!jIbW$9h8ywcj*9W-FV9r>k=?o# z@iF%#5N>|DJootQ*BmKVM%tpO;NDy#>S!8<3}StYlt57EkGhyV2@o2)T)2DDaiyc^ zzCEljK{E_L*c|&8qk)`!rg9bNe)RG9&hH;^`^6{HrKc`lvYvy(ta!jG)O{{#Y}_rhK$W8bFY0U8F~7L?f-tRwbH&SoSQ4dSOqL{fG)ek$rXE5M^6HDi z_HZhcig(e;*@!;W=~ljK^}pQKE|(T8Q8B5tfa{r|ykSaU&ZWiA{Ko0;d?|3+$`((E z2_j(8q?3n3?9o)7+1Sbl{o_{0Vusj)m!dk@$*->}vE?ffurd_u)b9Fh_rOk)Qii$S zxq438jVW%R%lNix>6v6xtnT(j%PIw0Ha`qa*YdUz2&61vN7lD)fDq=J&~ zY*u-Jwn@*<8|kl%J5sHdgD;C2$bxBc=a`HZ?8PzXpG0$bI(+gKkgw`S%yLbbJ&K)5uLR_wOi9A}G@b`{HoX2fX z13K%DeArwCB#2U3NO!2eL5SYjj=M4tL$>_UD; zrNhX<&KnEC7s2bz7C$PIL01)Z_%$~MhZLGYS|CN!c)n7oe9WG88yPcMy3I786%zK- zERF3bjk}p511rO0tw0%g4Z|9(HNKT~Sc$Mu7_{5R9a|@8zb6kpe$9`Lb6Tos3Mm~5 zB&+f~N6z%D!CxvSjO6D}eS743<|WgQe8U#tR*NIl!|TO0le<{`7ydJpzYb8df6F>kuV0S`?sjq8TUnC8Ui`#3#ob0#Cq|DTIVxI0#fNx4xReN^ z^MW$+JF})CXOtee&c=P)f##>pxTmA2-D=#bn3uPFvfRw^ZQj81Ahs^L23NA@3!XeT zR}WAByza#k%4TTbgIk>F_nhcmx8SHjI|DGmoMObxyx0K}b&YuZ6J{5^DlK7$9aAS$Dj2R25DA{+Q^ zMSWtLk39(EFJ3;F9RyU{8O6w-U*0Bw?~;}#$_U*75`A(Ri^n*Ue3V&_qt5uJuPm zLunqV)}a<_=2|IK#!Ytz9phI`k?(T~D5S>VwYzh%%+^qEn#6Yuji6(96G8nmblo@%eY7I}*^8M#naw z)ys7B-RE4IV&1if6L=oxyq$^LX8ti>NOVn_8Q2b7!`IxLH&c~{tZYv{sB-EGw2oLt z%!Zblz6lHKUr?Hl#N*#3S#wS%2y8f#HtkX4wb#K;r7iG4zO|}~+!xlPlRqbv3J@m@ z?c+K3rlh*_kae=?{HMtk`?o3iP76nk_Ck+wsg?c8K><^+Ed2aiX`a!17UGjd3Ai|N z@wL*OBLrVl-&6aO-%w1t+P)Oa6=@lUaXd@Sty|)^y(|7{Mfp<)BJ!q;+E)e<)^&J= zQ!}mg-naiIqy@)gtGCt<>nl8r3Dj47t$hEx`jDe7Cx;=FxA&)i(|_QIfxxp>{5ITv z0a`rq&|AuV<8TTllDi&r$b-wB=qACjDK-Ljam`SmfqK<#A%1S?54GGuQ?zRLM-te> z@F#UxI+{ht%Ag3QguaAlefHy~<2esN!}54#*_e2*KA-!g=AYU2F#5xhm=uLtMWNui zaRN6Is+OW3xCx@wnlkD!s;eQ`7b3@#_ZbdsYmmdk8ogFtxN^5+FAeiEf!wgH7ncQK za$;zNak`I<2YR+laq7JZHs zt%&4-pIJv`>=oZ%p;QSu28J2Mp0Quw%r!o6)`fhuVFD~U=pIRuD}E-v*F_dtS%F}1 zgC7j#Dx9Z8nBd2Rh~vfOhSkkI=)?!xD(oU5nqthqWRnh z`!rPu^J(QCHr!zjBh0Fsr%ar|25b4`$+qis#hi2O{ElOC^!$=lKOH!)Gu6A_6UYY-(-mjTiX!+_R$@>c3->E z<6{+!bH!OVpuD0xGP^k)GMiTR%j)NtvqH$Y^HbPpido5XoEJUjFV8RjFt}ARRKL*G z+JvV>(#)fpn@ZqG2F=;5g-_8YbBHm^uC!-0=@>`PQX$f?y>O!7tIL49=W`u~tkb)F zGRuW#!E)z!7ym-TjEvtgAz_H<=Mh0ZyMATg$n$=5mMAdElI3yqE}0p?a$gyzJZQgn zcgrYbn2^!{4K01Wg3TaMWk_@Zkc1!;SbswDXQ4SlHrMvu^>h7SM!Jp8+L(FqOxE z`L~nha6$6dK2E3My5CI9H>mlgrY|TeZSfcxLVy!Di-RlY&A)i>Yy5diuTdw{i>}-u ze-zOn{7^9t+>Xw7jn`e3(Wtg4Z(p(|l?uo68I|+~e`?l%4Z(^yhGG{*l@fQKr&FLt z0>Pc0Q@S}As1MrN2Xshy`O(UpY@f&byPc-9(mHyC(46NFt{i8C!3Z3RY6!9f-4l4##QA{TH~rM-`Qe2r{*3*!lX{-%{y}LTS32(43x| zRD8v3Me_1+sVx(2V)3{lo_XlpUiM6zq}wy|lvjQ)lM`&4HLe=oevge+{Tb!~w0%m; z{^7)j+@pLe?fI>S0)&rq9ZN!-oFjT@z6u}9(cGgq3Ugb^mzUaZKg)$NKW1sj*($%p zXb|CtLb||enc$`paENpR8znpzv%M>~^Nx3%@l?tVzD%GtH&v zE~Uu1wHn9G^K@rv%<~gdBKW2-Rnp?DVfmKU4={$BBZSSXF#>zNbBqzBd7&PGLlndJVJPN{ongLnl!ShYiT_?thW>Uh>J>@n&es6 z3M9R7|DxRn>8gE#vsTBp@g(!XQ_g3KayOK=Y4DHIO_X;#O`GwSNeNR(luO13=a?Vfo^mBFvdEa`CJjwF%l05V#Lk1JYSI&g|`ufn2 z#&xXhUB-SHpVDSRYe+>2>GidU2_BYz1L!Yv znGX!Jd(m5Om#~u@@=SV_8h$cNMFmHp8fz{G{T{&5D+|u&ZVNHL?l&f!z621jZ*l9O zh7>a8*hn``R2f@1=Bf@MGfcg%mgK!hje!06{XpWF(k&S?_f)v z%z9+o_P$#N*uM94_n3ADn(h~39c6>*ZgAmC3iSnwlFs55IS~$-V3wztF%d4_~LUzoXST-4ZgD&ROV%%oU7(w`{&CJZ&pDpy6@8Z9M*csri3r2OU zgNNYMn9JS$2HLQ{95pvsUafIWkoCZ|J0$b0;mcIM8zOX%)Fn~@9s1#ia6O)G9fe$^ zznRLav*EE6Y9ce&!%yZ?GfbMkpf(UJ_`e@tb*-AO^L0I0H3r}4q7HPoayXlW(N7>V zAw_g7{LytV zBBIe}wKPfEtS=sLxK{_{*2iQv&T5W4(vUS6$;4?BggJ%quWbD$kWkO>=Byx=P+y{> z53l=5Vvr@5sa(K0^Sz+nDqZkX6p`-7)K~^`jVbl!cn-m=j`y6l zt>u12xlWlhEU5T%0(Exq)H{<${9A*5sj+^FBC^q6Fjcpvag?{@W_Zymlh5b@g%z1q zHc;eBjv5_-4f3ZJEGK98*1ex$Nk^eksiXS&BNi3eIjMvu#U}XQKwzFdz)sRwV@)ar z$UV2(E?l5~9kFv8>=j-cqFsR+pIibtIrZL3JJ)CT+#DXHYs8%Tf*@CV@esfF8u)C1sh4;cE>`V8>~h2`od;)F_;vmAkA2dd z#+DhZ^O!n{ZWBc&HP;Go+AQNo?<<&}1wm@QQe`IghtbKqQMc33J|6(#mowpeiZCo;P*)=5C%)hrRTXosSmk7mmQsro10z9v73e!OWqx>CIP&;qY8G+y5 zOL>||wF=g5m-f4;={rTbxLs29Wldjr^fHRBnKUN|(&$R|z3GeqL&kbvgXk@EW_GXS z=5%DiDm9{3F9d@1`eV_zw`pHLxUSw=S#B-21zNhPyp|7J5zA->c^dT5y;Fid6zjtP zHEDEmu(CQPk2=28CyxG(EMwmuCmguKlPAS^Yrg2Wy%-_{A_n+-`pJ7NW4C70#+^L^8UL#3l95BrZj z1*vw{inxlnI}W<<^~`hTqc(Qk|D*}*>K?w}bXjvJ-;e{28f;Dp=x>uk6|Yw!X6O`u zlafl^)s_KP8rV+>Hp9bjLha%Qk2R3(sq&8$ed~aG3_-UEpZk4@M~ttIUQ@EU=_!84 z@=4_?!p=2XUR{B??Wc)BXorq3S@UueMZ?}DUTj1-EM^C)xbHE4Mv%TnN#AA+%yv!F z1;f)E0V~!yBRm6;`JKCU-p1+DAS;)bXB3<5mE?Cl?^h=j?XZxRa1(H!j(o)=c?IoInYo-F5G1t_L@DjL?M5i4l`82;Bx4EV|S7BuXWCv$1V ziqTwIGiU1v60lMbolYtyb2)>PvA#XJ^PfI_w9Nb5B5&UR^wS$>=YT-IjnKa`!P5?7 z&gRDd=KgfBK_C6{-E*~>cU;PpOMO?JFFN@-ZOdvPXYzZHx@M*6@X4w{sX~kBlVh&0 z2QU07R0Kla7=EHo94*KqZAkNBy5Y~k^cq3w#3o#uzd-yq;1HDPgO)}@eHk8?RDLP) zE-G&Bce)TK6pKqaHl+oVk`Gd9c+)%})DI5o>85}fH=}%LS|3n^jI|6ULvk!G2HiR^n(6$XGl}(>aqnh~p0@jPJ71ve903M^bl8 zGQT|@WDK`ucLI5{*Wqgj59#may7Kppj(St7R6G-P_#AS-r^l4|3%-P5vQ z{e{Mu*UmjO&EJ+ESk_%=)m=S2oyAJut_NwFc=r1G5EmkUR&!|ET)M19absS_&SA{xE+__0`bPEJ2>z#!4wy=T*ULC+3?;CxUj z!jOHpX;L$rM@LobCeECh4^@*YlPteW-p8~!mh*g| zk*yf%sAbb!yI<7WBNtuB5dF#Xy)A7Oi2m#a1T{cn)SukKZR1#Kb`Y&}LRhbQF@Ti7 zya;v$g|qM8Cr`n(lxVu#TG0c>+UI+3NG; z$(GWKEXqH*xwSM4Kyn?P)TKRrM8^e&gCQ8&=f9rgOsvAb=_T6A9n_|X@JDlpSF=n^ zHPFq-bB0CDw`HtQWTz2{umwo?NrWl^x|Uuk$i#DyqcivPpNAa+CjLxM>e0ittNSPG zP~2I>J)#Olic5seX;D*KN|O8xCNZaS5dIrtgJ!hD{xdG;Re|}Po>ld zlEC3EY%HyN!^PFUPGw#@b@5G?WhN$D4!)jzRt45-vxTe}DfltP%}Gj>brAt+$47Kt zua&>rlIe~=GF+Z5E?9s3c;2);jbr@m7?VARn)L3X8#}8LW~)%4=i6Zerd?5_h`f4_Lxn4JOj4*{L+-&-HK0^||biCf-P_W6$XNiKV z`Yv<^Zfo*zB(k?ds|jqg&xLxfT`pblxtBg0VZ4JzNeRR~Ug zDi0MJl@7Yip> zJf%I($jmlwa?<+}FvSsjc!~e_%?t3PISUh*aqdq&vj)G__5W#)vvLdud(Fo*urySo zx%b*epF)H7kEs&@z)PWGJ@eCwOUNXBv)mMPuw#3xWUmRhlM8-WL4MCH-keH>udloq zT@l*x+nn)5F4}@HIt}FcZ0bvhJnMcl@zQ137Zt`L>b?{ib8pS=46Xv&2RaXW0dK0S2^s{4edA@w&h%=5MMsEt*ojxraXGe!2YklPYKKx<(JvbC7S9v zkBMo7uEB!#uzK6ZfB>trG$x3^6cCtkxuXs^*R=@W1lZ6BY%`Nc4DiHXF#bNJ8Bf+a qQ2VTMKFFE$)D8j07>&qB9JK!*lfH1iUk3Pb7|>FCu3DjN9r}MY=_OPE diff --git a/source/map.cpp b/source/map.cpp index 9b8cd02..e689f8a 100644 --- a/source/map.cpp +++ b/source/map.cpp @@ -132,11 +132,7 @@ bool Map::setVars(std::string var, std::string value) // Indicador de éxito en la asignación bool success = true; - if (var == "bg_img") - { - bg_img = value; - } - else if (var == "tileset_img") + if (var == "tileset_img") { tileset_img = value; } @@ -176,10 +172,18 @@ void Map::fillMapTexture() SDL_RenderClear(renderer); // Dibuja el degradado de fondo - for (int i = 0; i < 208; i++) + const int num_lines = 208; + + const color_t color1 = {234, 171, 159}; + const color_t color2 = {144, 225, 231}; + + for (int i = 0; i < num_lines; i++) { - SDL_SetRenderDrawColor(renderer, 234, 171, 159, 0xFF); - SDL_SetRenderDrawColor(renderer, 144, 225, 231, 0xFF); + float step = ((float)i / (float)num_lines); + int r = color1.r + ((color2.r - color1.r) * step); + int g = color1.g + ((color2.g - color1.g) * step); + int b = color1.b + ((color2.b - color1.b) * step); + SDL_SetRenderDrawColor(renderer, r, g, b, 0xFF); SDL_RenderDrawLine(renderer, 0, i, 320, i); } @@ -205,6 +209,7 @@ void Map::fillMapTexture() // Dibuja el marco del marcador SDL_SetRenderDrawColor(renderer, 85, 50, 85, 0xFF); + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0xFF); SDL_Rect rect = {0, 208, 320, 32}; SDL_RenderDrawRect(renderer, &rect); rect = {1, 209, 318, 30}; diff --git a/source/map.h b/source/map.h index 51df551..59029ea 100644 --- a/source/map.h +++ b/source/map.h @@ -39,7 +39,6 @@ private: std::string room_left; // Identificador de la habitación que se encuentra a la izquierda std::string room_right; // Identificador de la habitación que se encuentra a la derecha std::string tileset_img; // Imagen con los graficos para la habitación - std::string bg_img; // Imagen con los graficos para la habitación std::vector tilemap; // Indice de los tiles a dibujar en la habitación LTexture *texture_tile; // Textura con los graficos de los tiles habitación SDL_Texture *map_texture; // Textura para dibujar el mapa de la habitación diff --git a/source/player.cpp b/source/player.cpp index f88baea..5aa91e4 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -82,12 +82,12 @@ void Player::checkInput() if (input->checkInput(INPUT_LEFT, REPEAT_TRUE)) { vx = std::max(vx -= accelX, -maxVX); - sprite->setFlip(SDL_FLIP_NONE); + sprite->setFlip(SDL_FLIP_HORIZONTAL); } else if (input->checkInput(INPUT_RIGHT, REPEAT_TRUE)) { vx = std::min(vx += accelX, maxVX); - sprite->setFlip(SDL_FLIP_HORIZONTAL); + sprite->setFlip(SDL_FLIP_NONE); } else { diff --git a/source/prog.cpp b/source/prog.cpp index 16dcf78..6d55dce 100644 --- a/source/prog.cpp +++ b/source/prog.cpp @@ -31,7 +31,7 @@ Prog::Prog(std::string executablePath) input = new Input(asset->get("gamecontrollerdb.txt")); screen = new Screen(window, renderer, options); - // Controles + // Controles input->bindKey(INPUT_UP, SDL_SCANCODE_UP); input->bindKey(INPUT_DOWN, SDL_SCANCODE_DOWN); input->bindKey(INPUT_LEFT, SDL_SCANCODE_LEFT); @@ -145,11 +145,11 @@ bool Prog::setFileList() asset->add("/data/map/03.map", data); asset->add("/data/map/03.tmx", data); asset->add("/data/map/surface.png", bitmap); - + // Ficheros de configuración asset->add("/data/config.bin", data, false); asset->add("/data/input/gamecontrollerdb.txt", data); - + // Ficheros del jugador asset->add("/data/player/player.png", bitmap); asset->add("/data/player/player.ani", data); @@ -172,6 +172,16 @@ bool Prog::setFileList() asset->add("/data/font/debug.png", font); asset->add("/data/font/debug.txt", font); + // Ficheros de enemigos + asset->add("/data/actors/enemies/walking_eye.png", bitmap); + asset->add("/data/actors/enemies/walking_eye.ani", data); + asset->add("/data/actors/enemies/bug.png", bitmap); + asset->add("/data/actors/enemies/bug.ani", data); + asset->add("/data/actors/enemies/flying_eye.png", bitmap); + asset->add("/data/actors/enemies/flying_eye.ani", data); + asset->add("/data/actors/enemies/flying_eye_horn.png", bitmap); + asset->add("/data/actors/enemies/flying_eye_horn.ani", data); + return asset->check(); }