Revisant la classe Balloon

This commit is contained in:
2024-10-26 14:13:08 +02:00
parent de2a29b669
commit f750997b34
6 changed files with 104 additions and 256 deletions

View File

@@ -448,8 +448,8 @@ void Game::createPowerBall()
constexpr int creation_time = 300;
const auto left = param.game.play_area.rect.x;
const auto center = param.game.play_area.center_x - (BALLOON_WIDTH_4 / 2);
const auto right = param.game.play_area.rect.w - BALLOON_WIDTH_4;
const auto center = param.game.play_area.center_x - (BALLOON_SIZE[3] / 2);
const auto right = param.game.play_area.rect.w - BALLOON_SIZE[3];
const auto luck = rand() % values;
const int x[values] = {left, left, center, center, right, right};
@@ -560,19 +560,19 @@ void Game::destroyBalloon(std::shared_ptr<Balloon> &balloon)
switch (balloon->getSize())
{
case BalloonSize::SIZE4:
score = BALLOON_SCORE_4 + (2 * BALLOON_SCORE_3) + (4 * BALLOON_SCORE_2) + (8 * BALLOON_SCORE_1);
score = BALLOON_SCORE[3] + (2 * BALLOON_SCORE[2]) + (4 * BALLOON_SCORE[1]) + (8 * BALLOON_SCORE[0]);
break;
case BalloonSize::SIZE3:
score = BALLOON_SCORE_3 + (2 * BALLOON_SCORE_2) + (4 * BALLOON_SCORE_1);
score = BALLOON_SCORE[2] + (2 * BALLOON_SCORE[1]) + (4 * BALLOON_SCORE[0]);
break;
case BalloonSize::SIZE2:
score = BALLOON_SCORE_2 + (2 * BALLOON_SCORE_1);
score = BALLOON_SCORE[1] + (2 * BALLOON_SCORE[0]);
break;
case BalloonSize::SIZE1:
score = BALLOON_SCORE_1;
score = BALLOON_SCORE[0];
break;
default:
@@ -764,8 +764,8 @@ void Game::checkBulletBalloonCollision()
{
return;
}
player->incScoreMultiplier();
player->addScore(balloon->getScore() * player->getScoreMultiplier() * difficulty_score_multiplier_);
player->incScoreMultiplier();
updateHiScore();
// Suelta el item si se da el caso