jaildesigner-jailgames/coffee_crisis_arcade_edition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 13 Wiki Activity

tots els singletons tornats a fer a la vieja y gorda usanza

Browse Source
This commit is contained in:
Sergio
2025-05-30 10:17:41 +02:00
parent 64b6f66044
commit f661da5215
29 changed files with 322 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
source/game.cpp
View File

@@ -101,7 +101,7 @@ Game::~Game()
// [Modo DEMO] Vuelve a activar los sonidos
if (demo_.enabled)
{
Audio::get().enableSound();
Audio::get()->enableSound();
}
else
{
@@ -109,7 +109,7 @@ Game::~Game()
auto manager = std::make_unique<ManageHiScoreTable>(options.game.hi_score_table);
manager->saveToFile(Asset::get()->get("score.bin"));
section::attract_mode = section::AttractMode::TITLE_TO_DEMO;
Audio::get().stopMusic();
Audio::get()->stopMusic();
}
#ifdef RECORDING
@@ -201,7 +201,7 @@ void Game::updateHiScore()
if (hi_score_achieved_ == false)
{
hi_score_achieved_ = true;
Audio::get().playSound("hi_score_achieved.wav");
Audio::get()->playSound("hi_score_achieved.wav");
}
}
}
@@ -259,7 +259,7 @@ void Game::updateStage()
// Cambio de fase
Stage::power = Stage::get(Stage::number).power_to_complete - Stage::power;
++Stage::number;
Audio::get().playSound("stage_change.wav");
Audio::get()->playSound("stage_change.wav");
balloon_manager_->resetBalloonSpeed();
screen_->flash(FLASH_COLOR, 3);
screen_->shake();
@@ -311,7 +311,7 @@ void Game::updateGameStateGameOver()
if (game_over_counter_ == GAME_OVER_COUNTER_)
{
createMessage({paths_.at(2), paths_.at(3)}, Resource::get()->getTexture("game_text_game_over"));
Audio::get().fadeOutMusic(1000);
Audio::get()->fadeOutMusic(1000);
balloon_manager_->setSounds(true);
}
@@ -328,7 +328,7 @@ void Game::updateGameStateGameOver()
if (options.audio.enabled)
{
const float VOL = static_cast<float>(64 * (100 - fade_out_->getValue())) / 100.0f;
Audio::get().setSoundVolume(static_cast<int>(VOL));
Audio::get()->setSoundVolume(static_cast<int>(VOL));
}
}
@@ -347,8 +347,8 @@ void Game::updateGameStateGameOver()
section::options = section::Options::HI_SCORE_AFTER_PLAYING;
if (options.audio.enabled)
{
Audio::get().stopAllSounds();
Audio::get().setSoundVolume(options.audio.sound.volume);
Audio::get()->stopAllSounds();
Audio::get()->setSoundVolume(options.audio.sound.volume);
}
}
}
@@ -481,7 +481,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
player->addScore(1000);
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(0)->getWidth()) / 2;
createItemText(x, game_text_textures_.at(0));
Audio::get().playSound("item_pickup.wav");
Audio::get()->playSound("item_pickup.wav");
break;
}
case ItemType::GAVINA:
@@ -489,7 +489,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
player->addScore(2500);
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(1)->getWidth()) / 2;
createItemText(x, game_text_textures_.at(1));
Audio::get().playSound("item_pickup.wav");
Audio::get()->playSound("item_pickup.wav");
break;
}
case ItemType::PACMAR:
@@ -497,7 +497,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
player->addScore(5000);
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(2)->getWidth()) / 2;
createItemText(x, game_text_textures_.at(2));
Audio::get().playSound("item_pickup.wav");
Audio::get()->playSound("item_pickup.wav");
break;
}
case ItemType::DEBIAN:
@@ -505,7 +505,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
player->addScore(100000);
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(6)->getWidth()) / 2;
createItemText(x, game_text_textures_.at(6));
Audio::get().playSound("debian_pickup.wav");
Audio::get()->playSound("debian_pickup.wav");
break;
}
case ItemType::CLOCK:
@@ -513,7 +513,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
enableTimeStopItem();
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(5)->getWidth()) / 2;
createItemText(x, game_text_textures_.at(5));
Audio::get().playSound("item_pickup.wav");
Audio::get()->playSound("item_pickup.wav");
break;
}
case ItemType::COFFEE:
@@ -530,7 +530,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(4)->getWidth()) / 2;
createItemText(x, game_text_textures_.at(4));
}
Audio::get().playSound("voice_coffee.wav");
Audio::get()->playSound("voice_coffee.wav");
break;
}
case ItemType::COFFEE_MACHINE:
@@ -539,7 +539,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
coffee_machine_enabled_ = false;
const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(3)->getWidth()) / 2;
createItemText(x, game_text_textures_.at(3));
Audio::get().playSound("voice_power_up.wav");
Audio::get()->playSound("voice_power_up.wav");
break;
}
default:
@@ -568,7 +568,7 @@ void Game::checkBulletCollision()
if (tabe_->tryToGetBonus())
{
createItem(ItemType::DEBIAN, pos.x, pos.y);
Audio::get().playSound("debian_drop.wav");
Audio::get()->playSound("debian_drop.wav");
}
else
{
@@ -576,7 +576,7 @@ void Game::checkBulletCollision()
{
createItem(ItemType::COFFEE, pos.x, pos.y);
}
Audio::get().playSound("tabe_hit.wav");
Audio::get()->playSound("tabe_hit.wav");
}
break;
}
@@ -598,7 +598,7 @@ void Game::checkBulletCollision()
if (dropped_item != ItemType::COFFEE_MACHINE)
{
createItem(dropped_item, balloon->getPosX(), balloon->getPosY());
Audio::get().playSound("item_drop.wav");
Audio::get()->playSound("item_drop.wav");
}
else
{
@@ -620,7 +620,7 @@ void Game::checkBulletCollision()
updateHiScore();
// Sonido de explosión
Audio::get().playSound("balloon.wav");
Audio::get()->playSound("balloon.wav");
// Deshabilita la bala
bullet->disable();
@@ -676,7 +676,7 @@ void Game::updateItems()
item->update();
if (item->isOnFloor())
{
Audio::get().playSound("title.wav");
Audio::get()->playSound("title.wav");
screen_->shake();
}
}
@@ -903,16 +903,16 @@ void Game::killPlayer(std::shared_ptr<Player> &player)
// Lo pierde
player->removeExtraHit();
throwCoffee(player->getPosX() + (player->getWidth() / 2), player->getPosY() + (player->getHeight() / 2));
Audio::get().playSound("coffee_out.wav");
Audio::get()->playSound("coffee_out.wav");
screen_->shake();
}
else
{
// Si no tiene cafes, muere
balloon_manager_->stopAllBalloons();
Audio::get().playSound("player_collision.wav");
Audio::get()->playSound("player_collision.wav");
screen_->shake();
Audio::get().playSound("voice_no.wav");
Audio::get()->playSound("voice_no.wav");
player->setPlayingState(PlayerState::DYING);
if (allPlayersAreNotPlaying())
{
@@ -932,7 +932,7 @@ void Game::updateTimeStopped()
{
if (time_stopped_counter_ % 30 == 0)
{
Audio::get().playSound("clock.wav");
Audio::get()->playSound("clock.wav");
}
}
else
@@ -940,12 +940,12 @@ void Game::updateTimeStopped()
if (time_stopped_counter_ % 30 == 0)
{
balloon_manager_->normalColorsToAllBalloons();
Audio::get().playSound("clock.wav");
Audio::get()->playSound("clock.wav");
}
else if (time_stopped_counter_ % 30 == 15)
{
balloon_manager_->reverseColorsToAllBalloons();
Audio::get().playSound("clock.wav");
Audio::get()->playSound("clock.wav");
}
}
}
@@ -1427,7 +1427,7 @@ void Game::handleFireInput(const std::shared_ptr<Player> &player, BulletType bul
player->setInput(bulletType == BulletType::UP ? InputAction::FIRE_CENTER : bulletType == BulletType::LEFT ? InputAction::FIRE_LEFT
: InputAction::FIRE_RIGHT);
createBullet(player->getPosX() + (player->getWidth() / 2) - 6, player->getPosY() + (player->getHeight() / 2), bulletType, player->isPowerUp(), player->getId());
Audio::get().playSound("bullet.wav");
Audio::get()->playSound("bullet.wav");
// Establece un tiempo de espera para el próximo disparo.
const int cooldown = player->isPowerUp() ? 5 : options.game.autofire ? 10
@@ -1629,7 +1629,7 @@ void Game::initDemo(int player_id)
}
// Deshabilita los sonidos
Audio::get().disableSound();
Audio::get()->disableSound();
// Configura los marcadores
scoreboard_->setMode(SCOREBOARD_LEFT_PANEL, ScoreboardMode::DEMO);
@@ -1731,7 +1731,7 @@ void Game::initPlayers(int player_id)
// Hace sonar la música
void Game::playMusic()
{
Audio::get().playMusic("playing.ogg");
Audio::get()->playMusic("playing.ogg");
}
// Detiene la música
@@ -1739,7 +1739,7 @@ void Game::stopMusic()
{
if (!demo_.enabled)
{
Audio::get().stopMusic();
Audio::get()->stopMusic();
}
}
@@ -1823,7 +1823,7 @@ void Game::updateGameStateEnteringPlayer()
{
setState(GameState::SHOWING_GET_READY_MESSAGE);
createMessage({paths_.at(0), paths_.at(1)}, Resource::get()->getTexture("game_text_get_ready"));
Audio::get().playSound("voice_get_ready.wav");
Audio::get()->playSound("voice_get_ready.wav");
}
}
}