From 0e918094296d7ace89be5049bf15438d0a1be493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Mon, 5 Sep 2022 16:13:44 +0200 Subject: [PATCH] Cambiado el fichero de tiles con colores de zxspectrum --- media/tilesets/standard.png | Bin 3087 -> 2286 bytes media/tilesets/standard_zxarne.png | Bin 0 -> 3087 bytes source/game.cpp | 15 +++++++++++---- source/game.h | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 media/tilesets/standard_zxarne.png diff --git a/media/tilesets/standard.png b/media/tilesets/standard.png index 1aafe9e200d4e5ba11d09c5f76ff8ff1e4e696e6..7b40a74ac4fff4563458f006d288464e492a3c4a 100644 GIT binary patch delta 2221 zcmZvadpy&N8^?{tTyl#uMa?E9cXFF(=2+w^?p9D=k@wLpJJ_LHL^JfyXWqL z#V1xQRbpdT4OFwMPqr~D&c^%bn_AOP4--ts?FT^hbD>D=&k2WOE^WF9j2U}ZLs$9SY43hNBXQ@MlQl2egMDyr4R8L`Ej;Sxe#*GN&}a1}FMTOM9aBqDnI zBYcZSF1vPf(i^GF_PLSW?^GwTmjFM0u2HM;V#XBIGdnmM{R`XygvNI#@cswBz!59% z|3-uSxpd%Pim|ITm(qEKz|+UuOQshumGpBsPCu2b-o5111S|57P>j7s!$}y^{hNE3 z$EHv$P_oVxj;_tz$5i8_M8)Jk(zsf@Q-n@nj^q-GigS&c^Z&HC7LtnE<;OFk?F85J zFS{_#29`8V{+QQmYv)-B(?@um%SJ1joP2=dSOoOZP$7>N&PdkHr7fjB_`B@{+QhZP z+`TNd_KATGYa6fG(^5;7{iy^eoj5T90k%N(Rxt&z6ZUuZPYo}31y zu@T=^MTner0ob`qTbymw1HxD^J9rTUEn6Y4r>i%IFDm8^DKWlo7!1dK<;#eK-W7eq z$Xx8otjK_sz>HE&GBfFFncA*9L6Y9<6S?hPN;4xtF*a-Y`4jpkekz?VSh5cU0!5So z<(bgW!3oqQ#n=WCb=tD^k6)VFo4hpfOFrJI^%r{fZ0#h)ukddheQqsw&lCmUFt+Mm_9bT8 zZsFhGjwEt#gzXtoyQ6m)79^AhgxFqqwV1o3SGoYY3udf(Z-U0bu=>=FI34NA1HLA8 zO-fQ)z|(drVsJ^2W-Gj0(%0gfI{g}-c6sm}XAnhAjpWf2x|>=i+|w5+DUN=>ivYiX zY4p)_j@>H{GY^S89nV}kksCnt;$%W$PaMBDrRX5Cc>r-_@@k4){Os#H!IHwox(*pS zfz6^SYOu%G7C&ONe>kncB+h9?8$PqpWrDBC1h`eDKLUt3fg_FlgO;`4E<1G2 zA~YMd-5_bJdGAZ40((Wu+r;TyFbwiKWMf5|SEXvHsX#u?cU_Xo2MwxwG>$%Jehovn&6a zLPLD8e0+Dfp@wdm0@SU}8FIbeix_SwaB>(IZq#eNK{#fZROBbcx%+~65MPx*-&eSW zF+q{?RfA_Bp|Heilh&0CY63pw=3YujSX8Wz#VL3L40%icc= zNun{t6G48ok{ejJaz^{jCczHSZ5402+8W?4s-WL}wA=PRp(B9@oAoB$URBA*Bn#(f zqp<68eV}hzzk{yco0jY_C(BZTr&|Y7UTaC-8~t|`dAPEaE@^s3@XY;U5wMWGe14aU8MZkeujxsy8#kIiX?SFdBxBka`@0n%%0*g zAUebx88Rrh2F1wsoj5YnW_F9b@KASSG#q1d^r4Q~=A}~^D{0#cwhcmhWW@r6<8>@; zPNec0JWcJWD%rvQo(&|gJsMPES?D6ORGq1EOrnmANA^qe|De&E7Pm{!*_KMCEd74Z z#IK1SjXv!xE_I%xpxtmARuNkywZSR^qratvmB}!PgaL~=qua3AnRr3Ol6pM@}4g7U3*xJJ2UmFmSfL3#*pzTL9}c-uzc}c0=v4*y@3}ee`H} zaHKwi0T?kDPt`+0utrT-XbaFUXzZIPjq00#i*QGT)?QijD;jSVZ;Si+2N-Z?wW2|v zEVJ7i!Us2Pbz-o@xxK{HUNRZVFQ4 zZL0%LEN#GuNy-;w|2TrY5u>PcBT7*-kxFv2LA-Kf?MS5ChDoeE4^Q0yG$~RaS^m4> zk4zMQJv+f{ykM|imZcVb`r+7{#e?c7WHo8gJ#S8A)=aUL#I=U+1Z0c6xtO#lD@ literal 3087 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 K(vYI>7WHpEHPFHU diff --git a/media/tilesets/standard_zxarne.png b/media/tilesets/standard_zxarne.png new file mode 100644 index 0000000000000000000000000000000000000000..1aafe9e200d4e5ba11d09c5f76ff8ff1e4e696e6 GIT binary patch literal 3087 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 K(vYI>7WHpEHPFHU literal 0 HcmV?d00001 diff --git a/source/game.cpp b/source/game.cpp index 29282f6..d49311c 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -7,8 +7,6 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input) clock = SDL_GetTicks(); currentRoom = "01.room"; spawnPoint = {2 * 8, 12 * 8, 0, 0, 0, s_standing, SDL_FLIP_NONE}; - spawnPoint = {154, 72, 0, 0, 0, s_standing, SDL_FLIP_NONE}; - debug = true; // Copia los punteros this->renderer = renderer; @@ -31,7 +29,10 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input) ticksSpeed = 15; playerLives = 9; itemsPicked = 0; - player->setInvincible(true); + + debug = true; + player->setInvincible(debug); + musicEnabled = !debug; section.name = SECTION_PROG_GAME; section.subsection = SUBSECTION_GAME_PLAY; @@ -89,6 +90,9 @@ void Game::checkEventHandler() case SDL_SCANCODE_D: debug = !debug; + player->setInvincible(debug); + musicEnabled = !debug; + musicEnabled ? JA_PlayMusic(music) : JA_StopMusic(); break; case SDL_SCANCODE_M: @@ -130,7 +134,10 @@ void Game::checkEventHandler() // Bucle para el juego section_t Game::run() { - JA_PlayMusic(music); + if (musicEnabled) + { + JA_PlayMusic(music); + } while (section.name == SECTION_PROG_GAME) { diff --git a/source/game.h b/source/game.h index 911d53c..2e33137 100644 --- a/source/game.h +++ b/source/game.h @@ -33,6 +33,7 @@ private: Text *debugText; // Objeto para los textos de debug del juego ScoreBoard *scoreboard; // Objeto encargado de gestionar el marcador JA_Music music; // Musica que suena durante el juego + bool musicEnabled; // Indica si ha de sonar la musica durante el juego int ticks; // Contador de ticks para ajustar la velocidad del programa int ticksSpeed; // Velocidad a la que se repiten los bucles del programa section_t section; // Seccion actual dentro del juego