jaildesigner-jailgames/coffee-crisis
1
0
Fork 1
Code Issues Pull Requests Projects Releases 14 Wiki Activity

treball en curs: correccions de tidy

Browse Source
This commit is contained in:
Sergio Valor
2026-05-16 14:04:59 +02:00
parent 48af959814
commit be18f51735
31 changed files with 1741 additions and 1966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/game.cpp
+33 -32
View File
@@ -23,9 +23,9 @@
#include "core/resources/resource.h"
#include "game/defaults.hpp" // for PLAY_AREA_CENTER_X, BLOCK, PLAY_AREA_CEN...
#include "game/entities/balloon.h" // for Balloon, BALLOON_VELX_NEGATIVE, BALLOON_...
#include "game/entities/bullet.h" // for Bullet, BulletKind::LEFT, BulletKind::RIGHT, BULLE...
#include "game/entities/item.h" // for Item, ITEM_COFFEE_MACHINE, ITEM_CLOCK
#include "game/entities/player.h" // for Player, DEATH_COUNTER
#include "game/entities/bullet.h" // for Bullet, Bullet::Kind::LEFT, Bullet::Kind::RIGHT, BULLE...
#include "game/entities/item.h" // for Item
#include "game/entities/player.h" // for Player
#include "game/options.hpp" // for Options
#include "game/ui/menu.h" // for Menu
struct JA_Sound_t;
@@ -190,7 +190,7 @@ void Game::init() {
menaceThreshold = 0;
hiScoreAchieved = false;
stageBitmapCounter = STAGE_COUNTER;
deathCounter = DEATH_COUNTER;
deathCounter = Player::DEATH_COUNTER;
timeStopped = false;
timeStoppedCounter = 0;
counter = 0;
@@ -1801,34 +1801,34 @@ void Game::checkPlayerItemCollision(Player *player) {
for (auto *item : items) {
if (item->isEnabled()) {
if (checkCollision(player->getCollider(), item->getCollider())) {
switch (item->getClass()) {
case ITEM_POINTS_1_DISK:
switch (item->getId()) {
case Item::Id::DISK:
player->addScore(1000);
updateHiScore();
createItemScoreSprite(item->getPosX() + (item->getWidth() / 2) - (n1000Sprite->getWidth() / 2), player->getPosY(), n1000Sprite);
Audio::get()->playSound(itemPickUpSound);
break;
case ITEM_POINTS_2_GAVINA:
case Item::Id::GAVINA:
player->addScore(2500);
updateHiScore();
createItemScoreSprite(item->getPosX() + (item->getWidth() / 2) - (n2500Sprite->getWidth() / 2), player->getPosY(), n2500Sprite);
Audio::get()->playSound(itemPickUpSound);
break;
case ITEM_POINTS_3_PACMAR:
case Item::Id::PACMAR:
player->addScore(5000);
updateHiScore();
createItemScoreSprite(item->getPosX() + (item->getWidth() / 2) - (n5000Sprite->getWidth() / 2), player->getPosY(), n5000Sprite);
Audio::get()->playSound(itemPickUpSound);
break;
case ITEM_CLOCK:
case Item::Id::CLOCK:
enableTimeStopItem();
Audio::get()->playSound(itemPickUpSound);
break;
case ITEM_COFFEE:
case Item::Id::COFFEE:
if (player->getCoffees() == 2) {
player->addScore(5000);
updateHiScore();
@@ -1838,7 +1838,7 @@ void Game::checkPlayerItemCollision(Player *player) {
Audio::get()->playSound(itemPickUpSound);
break;
case ITEM_COFFEE_MACHINE:
case Item::Id::COFFEE_MACHINE:
player->setPowerUp(true);
Audio::get()->playSound(itemPickUpSound);
coffeeMachineEnabled = false;
@@ -1878,9 +1878,9 @@ void Game::checkBulletBalloonCollision() {
bullet->disable();
// Suelta el item en caso de que salga uno
const Uint8 droppeditem = dropItem();
if ((droppeditem != NO_KIND) && !(demo.enabled) && !(demo.recording)) {
if (droppeditem != ITEM_COFFEE_MACHINE) {
const Item::Id droppeditem = dropItem();
if ((droppeditem != Item::Id::NONE) && !(demo.enabled) && !(demo.recording)) {
if (droppeditem != Item::Id::COFFEE_MACHINE) {
createItem(droppeditem, balloon->getPosX(), balloon->getPosY());
Audio::get()->playSound(itemDropSound);
} else {
@@ -1900,7 +1900,7 @@ void Game::checkBulletBalloonCollision() {
void Game::moveBullets() {
for (auto *bullet : bullets) {
if (bullet->isEnabled()) {
if (bullet->move() == BULLET_MOVE_OUT) {
if (bullet->move() == Bullet::MoveResult::OUT) {
players[bullet->getOwner()]->decScoreMultiplier();
}
}
@@ -1917,7 +1917,7 @@ void Game::renderBullets() {
}
// Crea un objeto bala
void Game::createBullet(int x, int y, BulletKind kind, bool poweredUp, int owner) {
void Game::createBullet(int x, int y, Bullet::Kind kind, bool poweredUp, int owner) {
auto *b = new Bullet(x, y, kind, poweredUp, owner, bulletTexture, renderer);
bullets.push_back(b);
}
@@ -1955,39 +1955,39 @@ void Game::renderItems() {
}
// Devuelve un item en función del azar
auto Game::dropItem() -> Uint8 {
auto Game::dropItem() -> Item::Id {
const Uint8 luckyNumber = rand() % 100;
const Uint8 item = rand() % 6;
switch (item) {
case 0:
if (luckyNumber < helper.itemPoints1Odds) {
return ITEM_POINTS_1_DISK;
return Item::Id::DISK;
}
break;
case 1:
if (luckyNumber < helper.itemPoints2Odds) {
return ITEM_POINTS_2_GAVINA;
return Item::Id::GAVINA;
}
break;
case 2:
if (luckyNumber < helper.itemPoints3Odds) {
return ITEM_POINTS_3_PACMAR;
return Item::Id::PACMAR;
}
break;
case 3:
if (luckyNumber < helper.itemClockOdds) {
return ITEM_CLOCK;
return Item::Id::CLOCK;
}
break;
case 4:
if (luckyNumber < helper.itemCoffeeOdds) {
helper.itemCoffeeOdds = ITEM_COFFEE_ODDS;
return ITEM_COFFEE;
return Item::Id::COFFEE;
} else {
if (helper.needCoffee) {
helper.itemCoffeeOdds++;
@@ -1999,7 +1999,7 @@ auto Game::dropItem() -> Uint8 {
if (luckyNumber < helper.itemCoffeeMachineOdds) {
helper.itemCoffeeMachineOdds = ITEM_COFFEE_MACHINE_ODDS;
if ((!coffeeMachineEnabled) && (helper.needCoffeeMachine)) {
return ITEM_COFFEE_MACHINE;
return Item::Id::COFFEE_MACHINE;
}
} else {
if (helper.needCoffeeMachine) {
@@ -2012,12 +2012,13 @@ auto Game::dropItem() -> Uint8 {
break;
}
return NO_KIND;
return Item::Id::NONE;
}
// Crea un objeto item
void Game::createItem(Uint8 kind, float x, float y) {
Item *item = new Item(kind, x, y, itemTextures[kind - 1], itemAnimations[kind - 1], renderer);
void Game::createItem(Item::Id kind, float x, float y) {
const auto index = static_cast<std::size_t>(kind) - 1;
Item *item = new Item(kind, x, y, itemTextures[index], itemAnimations[index], renderer);
items.push_back(item);
}
@@ -2474,7 +2475,7 @@ void Game::checkGameInput() {
if (demo.dataFile[demo.counter].fire == 1) {
if (players[index]->canFire()) {
players[index]->setInput(input_fire_center);
createBullet(players[index]->getPosX() + (players[index]->getWidth() / 2) - 4, players[index]->getPosY() + (players[index]->getHeight() / 2), BulletKind::UP, players[index]->isPowerUp(), index);
createBullet(players[index]->getPosX() + (players[index]->getWidth() / 2) - 4, players[index]->getPosY() + (players[index]->getHeight() / 2), Bullet::Kind::UP, players[index]->isPowerUp(), index);
players[index]->setFireCooldown(10);
}
}
@@ -2482,7 +2483,7 @@ void Game::checkGameInput() {
if (demo.dataFile[demo.counter].fireLeft == 1) {
if (players[index]->canFire()) {
players[index]->setInput(input_fire_left);
createBullet(players[index]->getPosX() + (players[index]->getWidth() / 2) - 4, players[index]->getPosY() + (players[index]->getHeight() / 2), BulletKind::LEFT, players[index]->isPowerUp(), index);
createBullet(players[index]->getPosX() + (players[index]->getWidth() / 2) - 4, players[index]->getPosY() + (players[index]->getHeight() / 2), Bullet::Kind::LEFT, players[index]->isPowerUp(), index);
players[index]->setFireCooldown(10);
}
}
@@ -2490,7 +2491,7 @@ void Game::checkGameInput() {
if (demo.dataFile[demo.counter].fireRight == 1) {
if (players[index]->canFire()) {
players[index]->setInput(input_fire_right);
createBullet(players[index]->getPosX() + (players[index]->getWidth() / 2) - 4, players[index]->getPosY() + (players[index]->getHeight() / 2), BulletKind::RIGHT, players[index]->isPowerUp(), index);
createBullet(players[index]->getPosX() + (players[index]->getWidth() / 2) - 4, players[index]->getPosY() + (players[index]->getHeight() / 2), Bullet::Kind::RIGHT, players[index]->isPowerUp(), index);
players[index]->setFireCooldown(10);
}
}
@@ -2532,7 +2533,7 @@ void Game::checkGameInput() {
if (Input::get()->checkInput(input_fire_center, REPEAT_TRUE, Options::inputs[i].deviceType, Options::inputs[i].id)) {
if (player->canFire()) {
player->setInput(input_fire_center);
createBullet(player->getPosX() + (player->getWidth() / 2) - 4, player->getPosY() + (player->getHeight() / 2), BulletKind::UP, player->isPowerUp(), i);
createBullet(player->getPosX() + (player->getWidth() / 2) - 4, player->getPosY() + (player->getHeight() / 2), Bullet::Kind::UP, player->isPowerUp(), i);
player->setFireCooldown(10);
// Reproduce el sonido de disparo
@@ -2546,7 +2547,7 @@ void Game::checkGameInput() {
if (Input::get()->checkInput(input_fire_left, REPEAT_TRUE, Options::inputs[i].deviceType, Options::inputs[i].id)) {
if (player->canFire()) {
player->setInput(input_fire_left);
createBullet(player->getPosX() + (player->getWidth() / 2) - 4, player->getPosY() + (player->getHeight() / 2), BulletKind::LEFT, player->isPowerUp(), i);
createBullet(player->getPosX() + (player->getWidth() / 2) - 4, player->getPosY() + (player->getHeight() / 2), Bullet::Kind::LEFT, player->isPowerUp(), i);
player->setFireCooldown(10);
// Reproduce el sonido de disparo
@@ -2560,7 +2561,7 @@ void Game::checkGameInput() {
if (Input::get()->checkInput(input_fire_right, REPEAT_TRUE, Options::inputs[i].deviceType, Options::inputs[i].id)) {
if (player->canFire()) {
player->setInput(input_fire_right);
createBullet(player->getPosX() + (player->getWidth() / 2) - 4, player->getPosY() + (player->getHeight() / 2), BulletKind::RIGHT, player->isPowerUp(), i);
createBullet(player->getPosX() + (player->getWidth() / 2) - 4, player->getPosY() + (player->getHeight() / 2), Bullet::Kind::RIGHT, player->isPowerUp(), i);
player->setFireCooldown(10);
// Reproduce el sonido de disparo