Commitet pa valgrind, he aprofitat i posat mes make_unique i enum class

This commit is contained in:
2024-10-07 10:49:29 +02:00
parent 4f0ea9dcf2
commit cffa4c3c92
8 changed files with 105 additions and 107 deletions

View File

@@ -15,7 +15,7 @@
#include "bullet.h" // for Bullet, BulletType::LEFT, BulletType::RIGHT
#include "enemy_formations.h" // for stage_t, EnemyFormations, enemyIni...
#include "explosions.h" // for Explosions
#include "fade.h" // for Fade, FADE_RANDOM_SQUARE, FADE_VEN...
#include "fade.h" // for Fade, fadeType::RANDOM_SQUARE, FADE_VEN...
#include "global_inputs.h" // for globalInputs::check
#include "input.h" // for inputs_e, Input, INPUT_DO_NOT_ALLO...
#include "item.h" // for Item, ITEM_COFFEE_MACHINE, ITEM_CLOCK
@@ -297,7 +297,7 @@ void Game::init(int playerID)
// Inicializa el objeto para el fundido
fade->setColor(fadeColor.r, fadeColor.g, fadeColor.b);
fade->setPost(param.fade.postDuration);
fade->setType(FADE_VENETIAN);
fade->setType(fadeType::VENETIAN);
// Con los globos creados, calcula el nivel de amenaza
evaluateAndSetMenace();
@@ -861,7 +861,7 @@ void Game::updatePlayers()
if (demo.enabled && allPlayersAreNotPlaying())
{
fade->setType(FADE_RANDOM_SQUARE);
fade->setType(fadeType::RANDOM_SQUARE);
fade->activate();
}
}
@@ -1840,7 +1840,7 @@ void Game::update()
// Activa el fundido antes de acabar con los datos de la demo
if (demo.counter == TOTAL_DEMO_DATA - 200)
{
fade->setType(FADE_RANDOM_SQUARE);
fade->setType(fadeType::RANDOM_SQUARE);
fade->activate();
}