4 putes merdes que no han servit pa res. Au demà miraré qué passa

This commit is contained in:
2024-08-13 23:01:48 +02:00
parent 054950f1d8
commit a5a3bb23da
2 changed files with 13 additions and 5 deletions

View File

@@ -1957,7 +1957,7 @@ void Game::update()
#endif
// Comprueba si la música ha de estar sonando
checkMusicStatus();
// checkMusicStatus();
// Actualiza el objeto screen
screen->update();
@@ -2100,6 +2100,12 @@ void Game::render()
// Dibuja el separador del marcador de la zona de juego
renderSeparator();
#ifdef DEBUG
text->write(0, 0, boolToString(players[0]->isAlive()));
text->write(0, 10, boolToString(players[1]->isAlive()));
text->write(0, 20, "POLLA");
#endif
// Dibuja el fade
fade->render();
@@ -2450,7 +2456,7 @@ void Game::checkMusicStatus()
// Reproduce la música
if (!gameCompleted)
{
if (players[0]->isAlive() || players[1]->isAlive())
if (!allPlayersAreDead())
{
JA_PlayMusic(music);
}
@@ -2630,7 +2636,8 @@ bool Game::allPlayersAreDead()
bool success = true;
for (auto player : players)
{
success &= (!player->isAlive() || !player->isEnabled());
// success &= (!player->isAlive() || !player->isEnabled());
success &= !player->isAlive();
}
return success;

View File

@@ -35,7 +35,7 @@ void Player::init()
// Inicializa variables de estado
posX = defaultPosX;
posY = defaultPosY;
alive = true;
alive = enabled;
statusWalking = PLAYER_STATUS_WALKING_STOP;
statusFiring = PLAYER_STATUS_FIRING_NO;
invulnerable = true;
@@ -302,7 +302,8 @@ void Player::setScore(Uint32 score)
// Incrementa la puntuación del jugador
void Player::addScore(Uint32 score)
{
if (enabled && alive)
//if (enabled && alive)
if (alive)
{
this->score += score;
}