clang-tidy modernize
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
#include "balloon_manager.h"
|
||||
|
||||
#include <stdlib.h> // Para rand
|
||||
|
||||
#include <algorithm> // Para remove_if
|
||||
#include <cstdlib> // Para rand
|
||||
#include <numeric> // Para accumulate
|
||||
|
||||
#include "balloon.h" // Para Balloon, BALLOON_SCORE, BALLOON_VELX...
|
||||
@@ -149,15 +148,15 @@ void BalloonManager::updateBalloonDeployCounter() {
|
||||
}
|
||||
|
||||
// Indica si se puede crear una powerball
|
||||
bool BalloonManager::canPowerBallBeCreated() { return (!power_ball_enabled_) && (calculateScreenPower() > POWERBALL_SCREENPOWER_MINIMUM) && (power_ball_counter_ == 0); }
|
||||
auto BalloonManager::canPowerBallBeCreated() -> bool { return (!power_ball_enabled_) && (calculateScreenPower() > POWERBALL_SCREENPOWER_MINIMUM) && (power_ball_counter_ == 0); }
|
||||
|
||||
// Calcula el poder actual de los globos en pantalla
|
||||
int BalloonManager::calculateScreenPower() {
|
||||
auto BalloonManager::calculateScreenPower() -> int {
|
||||
return std::accumulate(balloons_.begin(), balloons_.end(), 0, [](int sum, const auto &balloon) { return sum + (balloon->isEnabled() ? balloon->getPower() : 0); });
|
||||
}
|
||||
|
||||
// Crea un globo nuevo en el vector de globos
|
||||
std::shared_ptr<Balloon> BalloonManager::createBalloon(float x, int y, BalloonType type, BalloonSize size, float velx, float speed, int creation_timer) {
|
||||
auto BalloonManager::createBalloon(float x, int y, BalloonType type, BalloonSize size, float velx, float speed, int creation_timer) -> std::shared_ptr<Balloon> {
|
||||
if (can_deploy_balloons_) {
|
||||
const int INDEX = static_cast<int>(size);
|
||||
balloons_.emplace_back(std::make_shared<Balloon>(x, y, type, size, velx, speed, creation_timer, play_area_, balloon_textures_.at(INDEX), balloon_animations_.at(INDEX)));
|
||||
@@ -230,7 +229,7 @@ void BalloonManager::setBalloonSpeed(float speed) {
|
||||
}
|
||||
|
||||
// Explosiona un globo. Lo destruye y crea otros dos si es el caso
|
||||
int BalloonManager::popBalloon(std::shared_ptr<Balloon> balloon) {
|
||||
auto BalloonManager::popBalloon(std::shared_ptr<Balloon> balloon) -> int {
|
||||
Stage::addPower(1);
|
||||
int score = 0;
|
||||
|
||||
@@ -255,7 +254,7 @@ int BalloonManager::popBalloon(std::shared_ptr<Balloon> balloon) {
|
||||
}
|
||||
|
||||
// Explosiona un globo. Lo destruye = no crea otros globos
|
||||
int BalloonManager::destroyBalloon(std::shared_ptr<Balloon> &balloon) {
|
||||
auto BalloonManager::destroyBalloon(std::shared_ptr<Balloon> &balloon) -> int {
|
||||
int score = 0;
|
||||
|
||||
// Calcula la puntuación y el poder que generaria el globo en caso de romperlo a él y a sus hijos
|
||||
@@ -288,7 +287,7 @@ int BalloonManager::destroyBalloon(std::shared_ptr<Balloon> &balloon) {
|
||||
}
|
||||
|
||||
// Destruye todos los globos
|
||||
int BalloonManager::destroyAllBalloons() {
|
||||
auto BalloonManager::destroyAllBalloons() -> int {
|
||||
int score = 0;
|
||||
for (auto &balloon : balloons_) {
|
||||
score += destroyBalloon(balloon);
|
||||
@@ -344,7 +343,7 @@ void BalloonManager::createRandomBalloons() {
|
||||
for (int i = 0; i < NUM_BALLOONS; ++i) {
|
||||
const float X = param.game.game_area.rect.x + (rand() % static_cast<int>(param.game.game_area.rect.w)) - BALLOON_SIZE[3];
|
||||
const int Y = param.game.game_area.rect.y + (rand() % 50);
|
||||
const BalloonSize SIZE = static_cast<BalloonSize>(rand() % 4);
|
||||
const auto SIZE = static_cast<BalloonSize>(rand() % 4);
|
||||
const float VEL_X = (rand() % 2 == 0) ? BALLOON_VELX_POSITIVE : BALLOON_VELX_NEGATIVE;
|
||||
const int CREATION_COUNTER = 0;
|
||||
createBalloon(X, Y, BalloonType::BALLOON, SIZE, VEL_X, balloon_speed_, CREATION_COUNTER);
|
||||
@@ -352,7 +351,7 @@ void BalloonManager::createRandomBalloons() {
|
||||
}
|
||||
|
||||
// Obtiene el nivel de ameza actual generado por los globos
|
||||
int BalloonManager::getMenace() {
|
||||
auto BalloonManager::getMenace() -> int {
|
||||
return std::accumulate(balloons_.begin(), balloons_.end(), 0, [](int sum, const auto &balloon) { return sum + (balloon->isEnabled() ? balloon->getMenace() : 0); });
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user