From a354104c8cd0138ba50ac691645ab3ae44e3485d Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Mon, 31 Oct 2022 18:37:48 +0100 Subject: [PATCH] Trabajando en la carga de recursos por nombre --- data/enemies/batman_bell.ani | 9 ++ data/enemies/batman_bell.png | Bin 0 -> 415 bytes data/enemies/bell.ani | 9 ++ data/enemies/bell.png | Bin 0 -> 449 bytes data/room/25.room | 40 +++-- data/room/25.tmx | 32 ++-- data/tilesets/standard.png | Bin 7306 -> 7326 bytes source/common/resource.cpp | 8 +- source/director.cpp | 306 ++++++++++++++++++----------------- source/game.cpp | 2 +- 10 files changed, 227 insertions(+), 179 deletions(-) create mode 100644 data/enemies/batman_bell.ani create mode 100644 data/enemies/batman_bell.png create mode 100644 data/enemies/bell.ani create mode 100644 data/enemies/bell.png diff --git a/data/enemies/batman_bell.ani b/data/enemies/batman_bell.ani new file mode 100644 index 0000000..ab38cf6 --- /dev/null +++ b/data/enemies/batman_bell.ani @@ -0,0 +1,9 @@ +frameWidth=16 +frameHeight=16 + +[animation] +name=default +speed=6 +loop=0 +frames=0,1,2,3,4,5 +[/animation] \ No newline at end of file diff --git a/data/enemies/batman_bell.png b/data/enemies/batman_bell.png new file mode 100644 index 0000000000000000000000000000000000000000..3be226170e324960b15d450e2a514fc2a4cbe965 GIT binary patch literal 415 zcmV;Q0bu@#P)AHIP00001b5ch_0Itp) z=>Px$SxH1eR9J=WR?!ZFFbFJW|NqPEWh6I*0!5uB<7JKIj`IqgVCZA0yWP>X2sz;F^f2f|Yz(TO3%! zGtH~3bF26x^oJxERRMav%HiRy{U|4@Q^7~?6X~DE6$Z*PJ*wWJSMXWgRlKEXRsZxq zAbSVS1R$4(l|8IS5Xc*iZ&q&yuXC&VvBqYd)|Cc&`qCYhr_x$SDR){?Mig8SihqG>$#9f zl66X%E5qXO1n5JGrmkz!+0oIzGbLl-kpj9M{PakD=l=~nFW!tes*O@KF1P>y002ov JPDHLkV1n6?#$o^f literal 0 HcmV?d00001 diff --git a/data/enemies/bell.ani b/data/enemies/bell.ani new file mode 100644 index 0000000..19d50e2 --- /dev/null +++ b/data/enemies/bell.ani @@ -0,0 +1,9 @@ +frameWidth=16 +frameHeight=16 + +[animation] +name=default +speed=7 +loop=0 +frames=0,1,2,3,4,5,6,7,8,9,10,11 +[/animation] \ No newline at end of file diff --git a/data/enemies/bell.png b/data/enemies/bell.png new file mode 100644 index 0000000000000000000000000000000000000000..14b0f53862fcd1cff5470cd46ac229bbb50a36f1 GIT binary patch literal 449 zcmV;y0Y3hTP)Px$dr3q=RA_v0FbG8BPXGUx)u(h+2jKk{?~s3$fqKosxA|>4|3){@`l}3;m&IWD&x+)q@$SNics~Z_ zVq2iA0IL2fL*->LSpIpfHOBVt!iajmEy$|)sH*-dL*->L)G?^{XE0FjR|ekNTYd54 z-dh@=ntYX^@-i8%XJozttvgg literal 0 HcmV?d00001 diff --git a/data/room/25.room b/data/room/25.room index 8ce02fb..75bf792 100644 --- a/data/room/25.room +++ b/data/room/25.room @@ -1,33 +1,51 @@ name=no 25 -bgColor=black -border=red +bgColor=blue +border=yellow tileMapFile=25.tmx tileSetFile=standard.png roomUp=0 roomDown=0 roomLeft=06.room roomRight=26.room +itemColor1=yellow +itemColor2=cyan [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=batman_bell.png +animation=batman_bell.ani width=16 height=16 -x=2 +x=14 +y=12 +vx=0 +vy=0 +x1=14 +y1=12 +x2=14 +y2=12 +color=bright_cyan +[/enemy] + +[enemy] +tileSetFile=bell.png +animation=bell.ani +width=16 +height=16 +x=14 y=2 vx=0 vy=0 -x1=2 +x1=14 y1=2 -x2=2 +x2=14 y2=2 -color=magenta +color=bright_yellow [/enemy] [item] tileSetFile=items.png -tile=1 -x=1 -y=1 +tile=48 +x=17 +y=8 counter=1 [/item] \ No newline at end of file diff --git a/data/room/25.tmx b/data/room/25.tmx index ee220e2..4825542 100644 --- a/data/room/25.tmx +++ b/data/room/25.tmx @@ -3,22 +3,22 @@ -25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25 +67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68, +91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92, +93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,403,403,403,403,403,403,403,403,403,403,403,403,403,32,32, +117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,32, +141,0,0,0,0,0,0,0,0,0,0,0,426,427,426,427,426,427,0,0,0,0,0,0,0,0,0,0,0,0,32,32, +32,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,32,32, +0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,0,32,32, +0,0,0,0,0,0,0,0,0,0,0,0,141,0,0,0,0,141,0,0,0,0,0,0,0,0,0,0,0,0,32,32, +426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index 5ae050a526baeb981702c6d75d834a7952f1c7da..c2665f0e6d52abb24edfa1ab618015bc7c05eda4 100644 GIT binary patch delta 6541 zcmXwdc{J2t`2Tx`iLqxHDr<-^2$5~9S+f_}wOGzGY{KD6$r^ zjeQMcWSPaxx6k+Y``$mE`+Cmn+~?f$y61WBIj?xt9MzOd;7wzFo$Eo_+sGiRD+dC8!a(e0BU`mV`jXKjH1TH{OKC+kV z?t;wowdE8=jRkn}idb?n1qebx1Whj>hLZ2T^b`ZM#o5+hZbLbth`H#|?n}m=_xWvV z`ckZ$5I_Yu!t=Zv7GiRu+Wj+aD`NclyDv$3b{0s%l@LUxLqN?&v}c{hb6PJaHTLo6 zug*2H6!xlUAwl+JmLd3)4Hv;yotV3yVnr!m?a%8dpPAq-kN!{-##oD`8~A=b3cLZ$ z`RHcMyfWfXAwrCXs zL-O{^;kJNbpPJ!mh4qy?=2tdvrHUAPyu;Qn4NM&|$paNaiFcf$N;PdH>AqBRKvIeMsclyp9*%Z?NRT)v)Tz7uK-|$Yx7gb}nm>9i0=#V3CSB!4v zcSlZe)M?&e=Ir-p^l{Ys3-o>I%t{a@Ph)xJ099pA=fLmoLy6upT?v!^V}SMQ2p;~lnia;k+loV1%@yDW6; z>F++PA%w7_@bPcJoV-Aul^T|mS5IhL?0F=J#EOF2Cxt4kTNexWYkm%SNOo03KavyD z;XxZsR_#xp{c<~-{+58I-Qazp9+^3zrX|xcwpdeyTDy|-zLsNc`v*`!LF4j*{pbqM zUeZFQY(VWzwAbjpk2=*9*yVRQEBd>$gxeDhkV%aiCsi zjbEv}J3_FDOV1tGR(Sw07OYfm(BMAJR*dVK*#?%HF*lySm~XgOWyQS`9R?U9#csV` z6pa^Nnc(>E9$HPXH!DBa>F_V5s`=7#$C$}LWrWIJMHUM$7>0R4258YX`DAL(Li(2T zLLE@KNq2K+(ALh2xd7Ivcf!isx9_`bCH!0VMHs~GkM*5JO}Z6IItnW-@$DgT(9$!~ z`^^J_+PUlE(?kKkcdVcC(X6)fC>z&^hczIi7_ewedaG7UYWMY@-Q*jMVpJ8MJU4i7 zU9F66?E!@0F@DWx75gF;36qCp)w;kAAYkY&Nh|lWI9iODapp2@)O={3dIS0qk~g{Z zWvo>+Jy*{gZm^~7_v6+UJD^=2rs~yPPinHTDRre9Wjc`khM(Ly@Xsw8Z|64)spd92 zsV=8cv~ANbw51u+QYM7*%e9O%Y~#mMiu`jNIUN8q6+}lJqu7JW7tV|T#?&+#thyN- zVuS=9G|X@wt}eNIjfeCHCl`%s&B3~C*9%ja+W0v0Gjyf?S{p^@#9p1OuR0yFA>1X~ zY;>S0#pK4=A;#etJ>{orK=94z`;>K~quk^=SLTY`yu`r9>v&B|*T(72-jRwDP=25MiTA+jH3!sSuUZzkWsMDu$0L7`q_ zgy9&E!qVHQGeO^Ep~AK7Kkn5Vo*dgnxHNPVRUPa;vJ3xe!yBh2G0KC(1CBr#CHGxJ z6mGx8&@o(-a{`&6`=Xyu)}T^D@6eP+_WD|{FzSdXD z`Ez9?Yw>xSoZ{TNe1Ue%bC#$+MWqe>+AhXlH_x95J}nVvEyBf@8GY{~r_6-c-Rs$! z5{(-CAVP1`=g*i7?X|3BgR&&%v+^(yYnpBsck@hKlim2K%YE-c1LmRMzgJq9?$Yn6bRHIGK-e<=T$+3m`{&u2UQ!P#G9&l8<^H5EmtF)1H7ri3 z$2CDuRJ%Nox2uCL9}r5eq8Q?rWJ>8qyW<`%gYStCTZhkCeGgMmDJzcVHk>CZ8p zr>LxYqYE)l?Rc92{V26HSGcAF)}T>a#jtwOVSNOutP6p!cB1J9t*Y&X?7oL( zpats)bcVm9jU5Z(b&~@nb!R1~zy8+CSDtl*&I&MTsulj0#`W)-H5q^rGd?{ zU#ikcV~pGMcA}m$3s?kFX06w~ic~v5yLP({>}4;tPImkSKQ(??;;kY2FpYtaIc#S* z^Df?O^ey=tRn(s<|FOK&i0Er!rIUN2*e}{u@cm>lMd?3)Un#JlNYr@spNbq zY%h&*H4jgGuQ^vXc;`EB_pn%wj}UL^I(zHp6J9DgO|o>Ofr?tE@Pij-^RF^_&Tcp4p%x)$D~6{HsD z1xKsgmbIKOJ>UNAhmODz@yX_RJK-3e`o;JAWF9^~SPi%vH&`P(H-sd+n+2g; zqTm9mPo?KsY*bB07si@EaE)ZKMw+Wp>j;|__Sxs45hvsR4F|k0Z?ehQQ~}|NHuTN+ zM|&Em*n1|g8xn_lu=MWl*#sHhI8Ki)60Qtng{CE z8$}7BaTKZ^QRKOXa?)2vCTbZ_{xLyg&$D3gnQJqRWrE*^--hBF%u{fr5qg1ZD z7+!Sypzz;$n`)9tb`q3lYsfGL+QAc7+L3%kNa<0N7VxTn>?`u9SRa%9XEBCc`?Jdz z49PHzue^a+ikzHaI3Dvz>v|A#-_w+>mTNTL_*R9S1KY%4Cdla_A@lAMQbx`MJ~5cX zUlAc3o2=9TSU8nyC4xH4@*RoeQxoIBeNRU=Iw7|Im1j%Xs&k?au%7DN`KOV1<1e|B z@XOTKNPuy}hGY7}98kA3-RtjS7)CmlS+@Mj*%B0!-S3smHpGT#$f7+_e1UNxL#vG~K7aVFPYjb4isIMOae zEhFx)4b?nrr`YeU_2$B!p(rlI6VrF&JxzkA)P6(LH0B>hSTXI{W?EqyQ#W#XpJ8}cOJ(*9NKG(??8&>} zf`wf1bp*N}2==$6u!X#}go4r~##cs{=G->wpmm;!AA@ zosn&>l+ONuyVog?LiMhqGjS$?6}!v0O@bv02uGVSbC?Lnc&65Jnu0DEm3m;-{cV-M zK0}a)%?|j4n^8l&L|knHHw$fCyTffHGf$V6*Qk*L4V4?@hdGR&dX3JoA6#pta%9~` zSxmh5@zWz`&C9CPb-;J_8~zKmIQk>lzZAjbh31-B={;2GJlR(H$JG8u*G}v&yNd(b zf@&td1aPXnH{BezG1rhs+pY{l@46SjIQBbwSkE( z%X_C@jxgYO+eAA$SGx0l)cV+73<|(h(9hIVnaIBwT?t6Tum>L!f2Vl5V#?`5`)d1# zVl-MP57uk@WgWO*&Dui6XyPW;S}{nYEwn2LY=x+3IOhmC^SvnA+J8@u9C`AQ_TfYS zKNvgmBpChV7BbV;_s}7)T45&k3%R^fogq$|&*GVXl#<;Cf~R`erSy88>BJ1OufiAf zomJ)R>=d7w0loHoy@pP`hH6FT7FMB~eah$^-OnQQ?BvA!=_;Ij0c#t%Vbf3rEei&F zWj=}%Da=Z&E>xP8*E1PQto;Wp^-S0?K4r)Ubz$7RfpzU9(<+em=mf2LTQ=o1x&{BN z<6?k^)N$%wYsY!tsRgriUk?9p;WS|f%n}ldmFvqeHL42_U7R%HWS7dB*8@e7PHaqBY`+r?Phro|H4TC4eXZy#V-4lN} zEdQ-+)LrZ>hoDL7rwcdMJUyz)TYK)ToLhLymGrtHs4P@e!!B|>a$Ofn1t>u2fhZdV7MW{Rfg_| z8y40$#ppWAA>a8=(_U{8&d|aLZ=^@6KYb?UUlW=2Ck;YZvC?f z8lbq@r4SN(Wx{JzWB`|5sPxU*SBhQ&m0hg|6vl^TJd=yv#`8=yQeE`CAVZ_z#9>6R z#G4KWjkjNYXm8j%Ix2^44N9w*$4rPCf(5|c!m6Tz86RB#ofSQ&PwPaYn;M~f|+*BDDdLR9lPwMfI&C^Zubq2~ED|DDSp==!(yUt;|K2y)S>`@s+9B8hdL{*wJ!L;|*IB5%sY12I2KyebO+s_X2?<1S%oqbqaUd65S%1{bQ9jNy3 zlo7lBWQ^+GQ=O8PUKDtTXw`_SrrZxowLB{U21@i-I_-1zyFNaKwB}K2HxS7n_~scc z*U|?y2i8Mbuuar&ODFqR=f;?_b+kU^iB2?d19?YB&zfzhiM^EAoZY=6e|zcSgsLF) zdF)|3MtSi|fBpB*727Lo?NpT{@=z$542ec%RN^13Ge}yJA^v+3N3hiw*>{W^NFdpf zuq$xz+g2-hx!BrA;}Ew$H9l3)mM;zj`QNYFk`}=RndT)@@B~RQ>2mwWavjQ>qKQo3 z+{;8!f25vLwBTf!;XRtd;@If7qm*}9xRByl8;Bp?K5=$K&wi8 zQk|gq3fx^E`b@efs$;sjiUaCE@~j?iniFrOu1GuQ7``8>Yn#O59o$w;ZX@11xu@!9 z3SfJwS>#Bugp)x2)G5vZ#}C)MO@Yb8lfc5-YS5O}Po{U#vh3X5;0juJNtxS=57|U& zSFayY5%aT0f~4_uZSP;ZKRE}qm3p)3!f`QL?-Nujr;L_F*VhVX+(6Z@+CWKiVS>Uk zOK_$wDsxo{etohjIg_*G{kd?g`g{eenwdP04o-^l&!?Aba?9rk=ei_~Sw2d235D22 zWMEv>qcrgzEC-PI`LQcEBG5C_g7G%76(-Eu$=dV!luOYM@*js6GcB+}PC)}>rlH(A mLuV8;CCjn*;n46F!~#ursRQyMf?w!@4d|c delta 6536 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 Ho8bQf;xek~ diff --git a/source/common/resource.cpp b/source/common/resource.cpp index e5ca8c8..e9f1bfe 100644 --- a/source/common/resource.cpp +++ b/source/common/resource.cpp @@ -26,9 +26,13 @@ void Resource::loadAnimations(std::vector list) { for (auto l : list) { + // Extrae el nombre del fichero sin la extension para crear el nombre del fichero de la textura + const size_t lastIndex = l.find_last_of("."); + const std:: string pngFile = l.substr(0, lastIndex)+".png"; + res_animation_t as; - as.name = l + ".ani"; - as.animation = new animatedSprite_t(loadAnimationFromFile(getTexture(l + ".png"), asset->get(l + ".ani"))); + as.name = l; + as.animation = new animatedSprite_t(loadAnimationFromFile(getTexture(pngFile), asset->get(l))); animations.push_back(as); } } diff --git a/source/director.cpp b/source/director.cpp index fdbb505..21140f9 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -255,46 +255,48 @@ void Director::loadResources(section_t section) textureList.push_back("standard_zxarne.png"); // Enemigos - textureList.push_back("paco.png"); - textureList.push_back("chip.png"); - textureList.push_back("wave.png"); - textureList.push_back("wave_v.png"); - textureList.push_back("sigmasua.png"); - textureList.push_back("diskette.png"); - textureList.push_back("bird.png"); - textureList.push_back("bin.png"); - textureList.push_back("qvoid.png"); - textureList.push_back("batman.png"); - textureList.push_back("tuno.png"); - textureList.push_back("matatunos.png"); textureList.push_back("abad.png"); - textureList.push_back("jailbattle_human.png"); + textureList.push_back("amstrad_character_set.png"); + textureList.push_back("arounder_fly.png"); + textureList.push_back("arounder_stop.png"); + textureList.push_back("arounder_walk.png"); + textureList.push_back("arounders_door.png"); + textureList.push_back("arounders_machine.png"); + textureList.push_back("bat.png"); + textureList.push_back("batman_bell.png"); + textureList.push_back("batman.png"); + textureList.push_back("bell.png"); + textureList.push_back("bin.png"); + textureList.push_back("bird.png"); + textureList.push_back("breakout.png"); + textureList.push_back("bry.png"); + textureList.push_back("chip.png"); + textureList.push_back("code.png"); + textureList.push_back("demon.png"); + textureList.push_back("dimallas_v.png"); + textureList.push_back("dimallas.png"); + textureList.push_back("diskette.png"); + textureList.push_back("heavy.png"); textureList.push_back("jailbattle_alien.png"); + textureList.push_back("jailbattle_human.png"); textureList.push_back("jailer.png"); textureList.push_back("jailer2.png"); textureList.push_back("jailer3.png"); - textureList.push_back("printer.png"); - textureList.push_back("code.png"); - textureList.push_back("demon.png"); - textureList.push_back("dimallas.png"); - textureList.push_back("dimallas_v.png"); - textureList.push_back("heavy.png"); - textureList.push_back("spider.png"); - textureList.push_back("macaronni_ted.png"); - textureList.push_back("mummy.png"); - textureList.push_back("sam.png"); - textureList.push_back("amstrad_character_set.png"); - textureList.push_back("breakout.png"); textureList.push_back("lamp.png"); - textureList.push_back("bry.png"); - textureList.push_back("tv.png"); + textureList.push_back("macaronni_ted.png"); + textureList.push_back("matatunos.png"); + textureList.push_back("mummy.png"); + textureList.push_back("paco.png"); + textureList.push_back("printer.png"); + textureList.push_back("qvoid.png"); + textureList.push_back("sam.png"); + textureList.push_back("sigmasua.png"); + textureList.push_back("spider.png"); + textureList.push_back("tuno.png"); textureList.push_back("tv_panel.png"); - textureList.push_back("arounders_door.png"); - textureList.push_back("arounders_machine.png"); - textureList.push_back("arounder_walk.png"); - textureList.push_back("arounder_stop.png"); - textureList.push_back("arounder_fly.png"); - textureList.push_back("bat.png"); + textureList.push_back("tv.png"); + textureList.push_back("wave_v.png"); + textureList.push_back("wave.png"); // Items textureList.push_back("items.png"); @@ -312,46 +314,48 @@ void Director::loadResources(section_t section) animationList.push_back("player"); // Enemigos - animationList.push_back("paco"); - animationList.push_back("chip"); - animationList.push_back("wave"); - animationList.push_back("wave_v"); - animationList.push_back("sigmasua"); - animationList.push_back("diskette"); - animationList.push_back("bird"); - animationList.push_back("bin"); - animationList.push_back("qvoid"); - animationList.push_back("batman"); - animationList.push_back("tuno"); - animationList.push_back("matatunos"); - animationList.push_back("abad"); - animationList.push_back("jailbattle_human"); - animationList.push_back("jailbattle_alien"); - animationList.push_back("jailer"); - animationList.push_back("jailer2"); - animationList.push_back("jailer3"); - animationList.push_back("printer"); - animationList.push_back("code"); - animationList.push_back("demon"); - animationList.push_back("dimallas"); - animationList.push_back("dimallas_v"); - animationList.push_back("heavy"); - animationList.push_back("spider"); - animationList.push_back("macaronni_ted"); - animationList.push_back("mummy"); - animationList.push_back("sam"); - animationList.push_back("amstrad_character_set"); - animationList.push_back("breakout"); - animationList.push_back("lamp"); - animationList.push_back("bry"); - animationList.push_back("tv"); - animationList.push_back("tv_panel"); - animationList.push_back("arounders_door"); - animationList.push_back("arounders_machine"); - animationList.push_back("arounder_walk"); - animationList.push_back("arounder_stop"); - animationList.push_back("arounder_fly"); - animationList.push_back("bat"); + animationList.push_back("abad.ani"); + animationList.push_back("amstrad_character_set.ani"); + animationList.push_back("arounder_fly.ani"); + animationList.push_back("arounder_stop.ani"); + animationList.push_back("arounder_walk.ani"); + animationList.push_back("arounders_door.ani"); + animationList.push_back("arounders_machine.ani"); + animationList.push_back("bat.ani"); + animationList.push_back("batman_bell.ani"); + animationList.push_back("batman.ani"); + animationList.push_back("bell.ani"); + animationList.push_back("bin.ani"); + animationList.push_back("bird.ani"); + animationList.push_back("breakout.ani"); + animationList.push_back("bry.ani"); + animationList.push_back("chip.ani"); + animationList.push_back("code.ani"); + animationList.push_back("demon.ani"); + animationList.push_back("dimallas_v.ani"); + animationList.push_back("dimallas.ani"); + animationList.push_back("diskette.ani"); + animationList.push_back("heavy.ani"); + animationList.push_back("jailbattle_alien.ani"); + animationList.push_back("jailbattle_human.ani"); + animationList.push_back("jailer.ani"); + animationList.push_back("jailer2.ani"); + animationList.push_back("jailer3.ani"); + animationList.push_back("lamp.ani"); + animationList.push_back("macaronni_ted.ani"); + animationList.push_back("matatunos.ani"); + animationList.push_back("mummy.ani"); + animationList.push_back("paco.ani"); + animationList.push_back("printer.ani"); + animationList.push_back("qvoid.ani"); + animationList.push_back("sam.ani"); + animationList.push_back("sigmasua.ani"); + animationList.push_back("spider.ani"); + animationList.push_back("tuno.ani"); + animationList.push_back("tv_panel.ani"); + animationList.push_back("tv.ani"); + animationList.push_back("wave_v.ani"); + animationList.push_back("wave.ani"); resource->loadAnimations(animationList); @@ -829,86 +833,90 @@ bool Director::setFileList() asset->add("/data/tilesets/standard_zxarne.png", t_bitmap); // Enemigos - asset->add("/data/enemies/paco.png", t_bitmap); - asset->add("/data/enemies/paco.ani", t_data); - asset->add("/data/enemies/chip.png", t_bitmap); - asset->add("/data/enemies/chip.ani", t_data); - asset->add("/data/enemies/wave.png", t_bitmap); - asset->add("/data/enemies/wave.ani", t_data); - asset->add("/data/enemies/wave_v.png", t_bitmap); - asset->add("/data/enemies/wave_v.ani", t_data); - asset->add("/data/enemies/sigmasua.png", t_bitmap); - asset->add("/data/enemies/sigmasua.ani", t_data); - asset->add("/data/enemies/diskette.png", t_bitmap); - asset->add("/data/enemies/diskette.ani", t_data); - asset->add("/data/enemies/bird.png", t_bitmap); - asset->add("/data/enemies/bird.ani", t_data); - asset->add("/data/enemies/bin.png", t_bitmap); - asset->add("/data/enemies/bin.ani", t_data); - asset->add("/data/enemies/qvoid.png", t_bitmap); - asset->add("/data/enemies/qvoid.ani", t_data); - asset->add("/data/enemies/batman.png", t_bitmap); - asset->add("/data/enemies/batman.ani", t_data); - asset->add("/data/enemies/tuno.png", t_bitmap); - asset->add("/data/enemies/tuno.ani", t_data); - asset->add("/data/enemies/matatunos.png", t_bitmap); - asset->add("/data/enemies/matatunos.ani", t_data); - asset->add("/data/enemies/abad.png", t_bitmap); asset->add("/data/enemies/abad.ani", t_data); - asset->add("/data/enemies/jailbattle_human.png", t_bitmap); - asset->add("/data/enemies/jailbattle_human.ani", t_data); - asset->add("/data/enemies/jailbattle_alien.png", t_bitmap); - asset->add("/data/enemies/jailbattle_alien.ani", t_data); - asset->add("/data/enemies/jailer.png", t_bitmap); - asset->add("/data/enemies/jailer.ani", t_data); - asset->add("/data/enemies/jailer2.png", t_bitmap); - asset->add("/data/enemies/jailer2.ani", t_data); - asset->add("/data/enemies/jailer3.png", t_bitmap); - asset->add("/data/enemies/jailer3.ani", t_data); - asset->add("/data/enemies/printer.png", t_bitmap); - asset->add("/data/enemies/printer.ani", t_data); - asset->add("/data/enemies/code.png", t_bitmap); - asset->add("/data/enemies/code.ani", t_data); - asset->add("/data/enemies/demon.png", t_bitmap); - asset->add("/data/enemies/demon.ani", t_data); - asset->add("/data/enemies/dimallas.png", t_bitmap); - asset->add("/data/enemies/dimallas.ani", t_data); - asset->add("/data/enemies/dimallas_v.png", t_bitmap); - asset->add("/data/enemies/dimallas_v.ani", t_data); - asset->add("/data/enemies/heavy.png", t_bitmap); - asset->add("/data/enemies/heavy.ani", t_data); - asset->add("/data/enemies/spider.png", t_bitmap); - asset->add("/data/enemies/spider.ani", t_data); - asset->add("/data/enemies/macaronni_ted.png", t_bitmap); - asset->add("/data/enemies/macaronni_ted.ani", t_data); - asset->add("/data/enemies/mummy.png", t_bitmap); - asset->add("/data/enemies/mummy.ani", t_data); - asset->add("/data/enemies/sam.png", t_bitmap); - asset->add("/data/enemies/sam.ani", t_data); - asset->add("/data/enemies/amstrad_character_set.png", t_bitmap); + asset->add("/data/enemies/abad.png", t_bitmap); asset->add("/data/enemies/amstrad_character_set.ani", t_data); - asset->add("/data/enemies/breakout.png", t_bitmap); - asset->add("/data/enemies/breakout.ani", t_data); - asset->add("/data/enemies/lamp.png", t_bitmap); - asset->add("/data/enemies/lamp.ani", t_data); - asset->add("/data/enemies/bry.png", t_bitmap); - asset->add("/data/enemies/bry.ani", t_data); - asset->add("/data/enemies/tv.png", t_bitmap); - asset->add("/data/enemies/tv.ani", t_data); - asset->add("/data/enemies/tv_panel.png", t_bitmap); - asset->add("/data/enemies/tv_panel.ani", t_data); - asset->add("/data/enemies/arounders_door.png", t_bitmap); - asset->add("/data/enemies/arounders_door.ani", t_data); - asset->add("/data/enemies/arounders_machine.png", t_bitmap); - asset->add("/data/enemies/arounders_machine.ani", t_data); - asset->add("/data/enemies/arounder_walk.png", t_bitmap); - asset->add("/data/enemies/arounder_walk.ani", t_data); - asset->add("/data/enemies/arounder_stop.png", t_bitmap); - asset->add("/data/enemies/arounder_stop.ani", t_data); - asset->add("/data/enemies/arounder_fly.png", t_bitmap); + asset->add("/data/enemies/amstrad_character_set.png", t_bitmap); asset->add("/data/enemies/arounder_fly.ani", t_data); - asset->add("/data/enemies/bat.png", t_bitmap); + asset->add("/data/enemies/arounder_fly.png", t_bitmap); + asset->add("/data/enemies/arounder_stop.ani", t_data); + asset->add("/data/enemies/arounder_stop.png", t_bitmap); + asset->add("/data/enemies/arounder_walk.ani", t_data); + asset->add("/data/enemies/arounder_walk.png", t_bitmap); + asset->add("/data/enemies/arounders_door.ani", t_data); + asset->add("/data/enemies/arounders_door.png", t_bitmap); + asset->add("/data/enemies/arounders_machine.ani", t_data); + asset->add("/data/enemies/arounders_machine.png", t_bitmap); asset->add("/data/enemies/bat.ani", t_data); + asset->add("/data/enemies/bat.png", t_bitmap); + asset->add("/data/enemies/batman_bell.ani", t_data); + asset->add("/data/enemies/batman_bell.png", t_bitmap); + asset->add("/data/enemies/batman.ani", t_data); + asset->add("/data/enemies/batman.png", t_bitmap); + asset->add("/data/enemies/bell.ani", t_data); + asset->add("/data/enemies/bell.png", t_bitmap); + asset->add("/data/enemies/bin.ani", t_data); + asset->add("/data/enemies/bin.png", t_bitmap); + asset->add("/data/enemies/bird.ani", t_data); + asset->add("/data/enemies/bird.png", t_bitmap); + asset->add("/data/enemies/breakout.ani", t_data); + asset->add("/data/enemies/breakout.png", t_bitmap); + asset->add("/data/enemies/bry.ani", t_data); + asset->add("/data/enemies/bry.png", t_bitmap); + asset->add("/data/enemies/chip.ani", t_data); + asset->add("/data/enemies/chip.png", t_bitmap); + asset->add("/data/enemies/code.ani", t_data); + asset->add("/data/enemies/code.png", t_bitmap); + asset->add("/data/enemies/demon.ani", t_data); + asset->add("/data/enemies/demon.png", t_bitmap); + asset->add("/data/enemies/dimallas_v.ani", t_data); + asset->add("/data/enemies/dimallas_v.png", t_bitmap); + asset->add("/data/enemies/dimallas.ani", t_data); + asset->add("/data/enemies/dimallas.png", t_bitmap); + asset->add("/data/enemies/diskette.ani", t_data); + asset->add("/data/enemies/diskette.png", t_bitmap); + asset->add("/data/enemies/heavy.ani", t_data); + asset->add("/data/enemies/heavy.png", t_bitmap); + asset->add("/data/enemies/jailbattle_alien.ani", t_data); + asset->add("/data/enemies/jailbattle_alien.png", t_bitmap); + asset->add("/data/enemies/jailbattle_human.ani", t_data); + asset->add("/data/enemies/jailbattle_human.png", t_bitmap); + asset->add("/data/enemies/jailer.ani", t_data); + asset->add("/data/enemies/jailer.png", t_bitmap); + asset->add("/data/enemies/jailer2.ani", t_data); + asset->add("/data/enemies/jailer2.png", t_bitmap); + asset->add("/data/enemies/jailer3.ani", t_data); + asset->add("/data/enemies/jailer3.png", t_bitmap); + asset->add("/data/enemies/lamp.ani", t_data); + asset->add("/data/enemies/lamp.png", t_bitmap); + asset->add("/data/enemies/macaronni_ted.ani", t_data); + asset->add("/data/enemies/macaronni_ted.png", t_bitmap); + asset->add("/data/enemies/matatunos.ani", t_data); + asset->add("/data/enemies/matatunos.png", t_bitmap); + asset->add("/data/enemies/mummy.ani", t_data); + asset->add("/data/enemies/mummy.png", t_bitmap); + asset->add("/data/enemies/paco.ani", t_data); + asset->add("/data/enemies/paco.png", t_bitmap); + asset->add("/data/enemies/printer.ani", t_data); + asset->add("/data/enemies/printer.png", t_bitmap); + asset->add("/data/enemies/qvoid.ani", t_data); + asset->add("/data/enemies/qvoid.png", t_bitmap); + asset->add("/data/enemies/sam.ani", t_data); + asset->add("/data/enemies/sam.png", t_bitmap); + asset->add("/data/enemies/sigmasua.ani", t_data); + asset->add("/data/enemies/sigmasua.png", t_bitmap); + asset->add("/data/enemies/spider.ani", t_data); + asset->add("/data/enemies/spider.png", t_bitmap); + asset->add("/data/enemies/tuno.ani", t_data); + asset->add("/data/enemies/tuno.png", t_bitmap); + asset->add("/data/enemies/tv_panel.ani", t_data); + asset->add("/data/enemies/tv_panel.png", t_bitmap); + asset->add("/data/enemies/tv.ani", t_data); + asset->add("/data/enemies/tv.png", t_bitmap); + asset->add("/data/enemies/wave_v.ani", t_data); + asset->add("/data/enemies/wave_v.png", t_bitmap); + asset->add("/data/enemies/wave.ani", t_data); + asset->add("/data/enemies/wave.png", t_bitmap); // Jugador asset->add("/data/player/player.png", t_bitmap); diff --git a/source/game.cpp b/source/game.cpp index 3d6d6a7..9b561a5 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -20,7 +20,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *as // **** // this->debug->setEnabled(true); - currentRoom = "14.room"; + currentRoom = "06.room"; const int x = 30; const int y = 13; spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};