From 384cfa7156a3f95fb4cd3b5aef07b94942b7467a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Sun, 29 Aug 2021 22:55:19 +0200 Subject: [PATCH] Solved 1P death music. Some tweaks to bg.png --- media/gfx/game_bg.png | Bin 14724 -> 14705 bytes source/game.cpp | 24 +++++++++++++++++++----- source/game.h | 28 ++++++++++++++-------------- source/player.cpp | 2 ++ source/title.cpp | 4 ++-- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/media/gfx/game_bg.png b/media/gfx/game_bg.png index 766b05df84f8d9cb98f3c9ecaa0e397adbe26d7b..35b72c1a39d16b1910673b6d07927c59e0ca9817 100644 GIT binary patch delta 12918 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 delta 12877 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 + allAreDead &= (!mPlayer[i]->isAlive()); if (!mPlayer[i]->isAlive()) { @@ -1776,9 +1776,9 @@ void Game::updateDeath() } } - if (allPlayersAreDead) + if (allAreDead) { - JA_StopMusic(); + //JA_StopMusic(); if (mDeathCounter > 0) { @@ -2530,14 +2530,18 @@ void Game::killPlayer(int index) } else { + JA_PauseMusic(); stopAllBalloons(10); - //JA_StopMusic(); JA_PlaySound(mSoundPlayerCollision); shakeScreen(); SDL_Delay(500); JA_PlaySound(mSoundCoffeeOut); throwPlayer(mPlayer[index]->getPosX(), mPlayer[index]->getPosY(), index); mPlayer[index]->setAlive(false); + if (allPlayersAreDead()) + JA_StopMusic(); + else + JA_ResumeMusic(); } } } @@ -3478,4 +3482,14 @@ void Game::updateHelper() mHelper.needCoffee = false; mHelper.needCoffeeMachine = false; } +} + +// Comprueba si todos los jugadores han muerto +bool Game::allPlayersAreDead() +{ + bool success = true; + for (int i = 0; i < mNumPlayers; i++) + success &= (!mPlayer[i]->isAlive()); + + return success; } \ No newline at end of file diff --git a/source/game.h b/source/game.h index b11a1ed..da4939e 100644 --- a/source/game.h +++ b/source/game.h @@ -191,7 +191,7 @@ private: Uint8 mDifficulty; // Dificultad del juego float mDifficultyScoreMultiplier; // Multiplicador de puntos en función de la dificultad struct options_t *mOptions; // Variable con todas las variables de las opciones del programa - Uint8 mOnePlayerControl; // Variable para almacenar el valor de las opciones + Uint8 mOnePlayerControl; // Variable para almacenar el valor de las opciones struct demo_t { @@ -212,13 +212,6 @@ private: }; debug_t mDebug; -public: - // Constructor - Game(int numPlayers, SDL_Renderer *renderer, std::string *filelist, Lang *lang, Input *input, bool demo, options_t *options); - - // Destructor - ~Game(); - // Inicializa el vector con los valores del seno void initSin(); @@ -255,9 +248,6 @@ public: // Aumenta el poder de la fase void increaseStageCurrentPower(Uint8 power); - // Establece el valor de la variable - //void setScore(Uint32 score); - // Establece el valor de la variable void setHiScore(Uint32 score); @@ -477,9 +467,6 @@ public: // Agita la pantalla void shakeScreen(); - // Bucle para el juego - section_t run(); - // Bucle para el menu de pausa del juego void runPausedGame(); @@ -503,6 +490,19 @@ public: // Actualiza las variables de ayuda void updateHelper(); + + // Comprueba si todos los jugadores han muerto + bool allPlayersAreDead(); + +public: + // Constructor + Game(int numPlayers, SDL_Renderer *renderer, std::string *filelist, Lang *lang, Input *input, bool demo, options_t *options); + + // Destructor + ~Game(); + + // Bucle para el juego + section_t run(); }; #endif diff --git a/source/player.cpp b/source/player.cpp index 7479ef4..66f2873 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -640,6 +640,7 @@ void Player::setInvulnerableCounter(Uint16 value) void Player::updateInvulnerableCounter() { if (mInvulnerable) + { if (mInvulnerableCounter > 0) { mInvulnerableCounter--; @@ -649,6 +650,7 @@ void Player::updateInvulnerableCounter() mInvulnerable = false; mInvulnerableCounter = PLAYER_INVULNERABLE_COUNTER; } + } } // Actualiza el valor de la variable diff --git a/source/title.cpp b/source/title.cpp index 14aab99..df5c160 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -221,8 +221,8 @@ void Title::init(bool demo, Uint8 subsection) // Crea el mosaico de fondo del titulo createTiledBackground(); - mBackgroundWindow.x = 0; - mBackgroundWindow.y = 0; + mBackgroundWindow.x = 128; + mBackgroundWindow.y = 96; mBackgroundWindow.w = SCREEN_WIDTH; mBackgroundWindow.h = SCREEN_HEIGHT;