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

canvi de pc (toquejant Options)

Browse Source
This commit is contained in:
Sergio
2025-06-14 16:28:36 +02:00
parent 4b8cc67b5c
commit 23e8f90274
27 changed files with 505 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/credits.cpp
View File

@@ -44,7 +44,7 @@ Credits::Credits()
{ {
throw std::runtime_error("Failed to create SDL texture for text."); throw std::runtime_error("Failed to create SDL texture for text.");
} }
section::name = section::Name::CREDITS; Section::name = Section::Name::CREDITS;
balloon_manager_->setPlayArea(play_area_); balloon_manager_->setPlayArea(play_area_);
fade_in_->setColor(FADE_COLOR.r, FADE_COLOR.g, FADE_COLOR.b); fade_in_->setColor(FADE_COLOR.r, FADE_COLOR.g, FADE_COLOR.b);
@@ -78,7 +78,7 @@ Credits::~Credits()
// Bucle principal // Bucle principal
void Credits::run() void Credits::run()
{ {
while (section::name == section::Name::CREDITS) while (Section::name == Section::Name::CREDITS)
{ {
checkInput(); checkInput();
update(); update();
@@ -134,7 +134,7 @@ void Credits::checkEvents()
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) while (SDL_PollEvent(&event))
{ {
globalEvents::check(event); GlobalEvents::check(event);
} }
} }
@@ -156,7 +156,7 @@ void Credits::checkInput()
} }
// Comprueba los inputs que se pueden introducir en cualquier sección del juego // Comprueba los inputs que se pueden introducir en cualquier sección del juego
globalInputs::check(); GlobalInputs::check();
} }
// Crea la textura con el texto // Crea la textura con el texto
@@ -169,10 +169,10 @@ void Credits::fillTextTexture()
SDL_RenderClear(Screen::get()->getRenderer()); SDL_RenderClear(Screen::get()->getRenderer());
const std::array<std::string, 10> TEXTS = { const std::array<std::string, 10> TEXTS = {
lang::getText("[CREDITS] PROGRAMMED_AND_DESIGNED_BY"), Lang::getText("[CREDITS] PROGRAMMED_AND_DESIGNED_BY"),
lang::getText("[CREDITS] PIXELART_DRAWN_BY"), Lang::getText("[CREDITS] PIXELART_DRAWN_BY"),
lang::getText("[CREDITS] MUSIC_COMPOSED_BY"), Lang::getText("[CREDITS] MUSIC_COMPOSED_BY"),
lang::getText("[CREDITS] SOUND_EFFECTS"), Lang::getText("[CREDITS] SOUND_EFFECTS"),
"JAILDESIGNER", "JAILDESIGNER",
"JAILDOCTOR (INTRO)", "JAILDOCTOR (INTRO)",
"ERIC MATYAS (SOUNDIMAGE.ORG)", "ERIC MATYAS (SOUNDIMAGE.ORG)",
@@ -481,7 +481,7 @@ void Credits::updateAllFades()
fade_out_->update(); fade_out_->update();
if (fade_out_->hasEnded()) if (fade_out_->hasEnded())
{ {
section::name = section::Name::HI_SCORE_TABLE; Section::name = Section::Name::HI_SCORE_TABLE;
} }
} }

12
source/define_buttons.cpp
View File

@@ -28,7 +28,7 @@ void DefineButtons::render()
{ {
if (enabled_) if (enabled_)
{ {
text_->writeCentered(x_, y_ - 10, lang::getText("[DEFINE_BUTTONS] PLAYER") + std::to_string(options.controllers.at(index_controller_).player_id)); text_->writeCentered(x_, y_ - 10, Lang::getText("[DEFINE_BUTTONS] PLAYER") + std::to_string(options.controllers.at(index_controller_).player_id));
text_->writeCentered(x_, y_, controller_names_.at(index_controller_)); text_->writeCentered(x_, y_, controller_names_.at(index_controller_));
text_->writeCentered(x_, y_ + 10, buttons_.at(index_button_).label); text_->writeCentered(x_, y_ + 10, buttons_.at(index_button_).label);
} }
@@ -135,9 +135,9 @@ bool DefineButtons::checkButtonNotInUse(SDL_GamepadButton button)
void DefineButtons::clearButtons() void DefineButtons::clearButtons()
{ {
buttons_.clear(); buttons_.clear();
buttons_.emplace_back(lang::getText("[DEFINE_BUTTONS] FIRE_LEFT"), InputAction::FIRE_LEFT, SDL_GAMEPAD_BUTTON_INVALID); buttons_.emplace_back(Lang::getText("[DEFINE_BUTTONS] FIRE_LEFT"), InputAction::FIRE_LEFT, SDL_GAMEPAD_BUTTON_INVALID);
buttons_.emplace_back(lang::getText("[DEFINE_BUTTONS] FIRE_UP"), InputAction::FIRE_CENTER, SDL_GAMEPAD_BUTTON_INVALID); buttons_.emplace_back(Lang::getText("[DEFINE_BUTTONS] FIRE_UP"), InputAction::FIRE_CENTER, SDL_GAMEPAD_BUTTON_INVALID);
buttons_.emplace_back(lang::getText("[DEFINE_BUTTONS] FIRE_RIGHT"), InputAction::FIRE_RIGHT, SDL_GAMEPAD_BUTTON_INVALID); buttons_.emplace_back(Lang::getText("[DEFINE_BUTTONS] FIRE_RIGHT"), InputAction::FIRE_RIGHT, SDL_GAMEPAD_BUTTON_INVALID);
buttons_.emplace_back(lang::getText("[DEFINE_BUTTONS] START"), InputAction::START, SDL_GAMEPAD_BUTTON_INVALID); buttons_.emplace_back(Lang::getText("[DEFINE_BUTTONS] START"), InputAction::START, SDL_GAMEPAD_BUTTON_INVALID);
buttons_.emplace_back(lang::getText("[DEFINE_BUTTONS] SERVICE_MENU"), InputAction::SERVICE, SDL_GAMEPAD_BUTTON_INVALID); buttons_.emplace_back(Lang::getText("[DEFINE_BUTTONS] SERVICE_MENU"), InputAction::SERVICE, SDL_GAMEPAD_BUTTON_INVALID);
} }

40
source/director.cpp
View File

@@ -49,13 +49,13 @@ Director::Director(int argc, const char *argv[])
section::name = section::Name::GAME; section::name = section::Name::GAME;
section::options = section::Options::GAME_PLAY_1P; section::options = section::Options::GAME_PLAY_1P;
#elif DEBUG #elif DEBUG
section::name = section::Name::LOGO; Section::name = Section::Name::LOGO;
section::options = section::Options::GAME_PLAY_1P; Section::options = Section::Options::GAME_PLAY_1P;
#else // NORMAL GAME #else // NORMAL GAME
section::name = section::Name::LOGO; section::name = section::Name::LOGO;
section::options = section::Options::NONE; section::options = section::Options::NONE;
#endif #endif
section::attract_mode = section::AttractMode::TITLE_TO_DEMO; Section::attract_mode = Section::AttractMode::TITLE_TO_DEMO;
// Establece el nivel de prioridad de la categoría de registro // Establece el nivel de prioridad de la categoría de registro
SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
@@ -93,7 +93,7 @@ void Director::init()
loadScoreFile(); // Carga el archivo de puntuaciones loadScoreFile(); // Carga el archivo de puntuaciones
// Inicialización de subsistemas principales // Inicialización de subsistemas principales
lang::setLanguage(options.game.language); // Carga el archivo de idioma Lang::setLanguage(options.game.language); // Carga el archivo de idioma
Screen::init(); // Inicializa la pantalla y el sistema de renderizado Screen::init(); // Inicializa la pantalla y el sistema de renderizado
Audio::init(); // Activa el sistema de audio Audio::init(); // Activa el sistema de audio
Resource::init(); // Inicializa el sistema de gestión de recursos Resource::init(); // Inicializa el sistema de gestión de recursos
@@ -123,7 +123,7 @@ void Director::close()
SDL_Quit(); SDL_Quit();
// Apaga el sistema // Apaga el sistema
shutdownSystem(section::options == section::Options::SHUTDOWN); shutdownSystem(Section::options == Section::Options::SHUTDOWN);
} }
// Carga los parametros // Carga los parametros
@@ -574,7 +574,7 @@ void Director::runTitle()
// Ejecuta la sección donde se juega al juego // Ejecuta la sección donde se juega al juego
void Director::runGame() void Director::runGame()
{ {
const auto player_id = section::options == section::Options::GAME_PLAY_1P ? 1 : 2; const auto player_id = Section::options == Section::Options::GAME_PLAY_1P ? 1 : 2;
#ifdef DEBUG #ifdef DEBUG
constexpr auto current_stage = 0; constexpr auto current_stage = 0;
#else #else
@@ -619,49 +619,49 @@ void Director::reset()
{ {
saveOptionsFile(Asset::get()->get("config.txt")); saveOptionsFile(Asset::get()->get("config.txt"));
loadOptionsFile(Asset::get()->get("config.txt")); loadOptionsFile(Asset::get()->get("config.txt"));
lang::setLanguage(options.game.language); Lang::setLanguage(options.game.language);
Audio::get()->stopMusic(); Audio::get()->stopMusic();
Audio::get()->stopAllSounds(); Audio::get()->stopAllSounds();
if (section::options == section::Options::RELOAD || true) if (Section::options == Section::Options::RELOAD || true)
{ {
Resource::get()->reload(); Resource::get()->reload();
} }
ServiceMenu::get()->reset(); ServiceMenu::get()->reset();
section::name = section::Name::LOGO; Section::name = Section::Name::LOGO;
} }
int Director::run() int Director::run()
{ {
// Bucle principal // Bucle principal
while (section::name != section::Name::QUIT) while (Section::name != Section::Name::QUIT)
{ {
switch (section::name) switch (Section::name)
{ {
case section::Name::RESET: case Section::Name::RESET:
reset(); reset();
break; break;
case section::Name::LOGO: case Section::Name::LOGO:
runLogo(); runLogo();
break; break;
case section::Name::INTRO: case Section::Name::INTRO:
runIntro(); runIntro();
break; break;
case section::Name::TITLE: case Section::Name::TITLE:
runTitle(); runTitle();
break; break;
case section::Name::GAME: case Section::Name::GAME:
runGame(); runGame();
break; break;
case section::Name::HI_SCORE_TABLE: case Section::Name::HI_SCORE_TABLE:
runHiScoreTable(); runHiScoreTable();
break; break;
case section::Name::GAME_DEMO: case Section::Name::GAME_DEMO:
runDemoGame(); runDemoGame();
break; break;
case section::Name::INSTRUCTIONS: case Section::Name::INSTRUCTIONS:
runInstructions(); runInstructions();
break; break;
case section::Name::CREDITS: case Section::Name::CREDITS:
runCredits(); runCredits();
break; break;
default: default:

4
source/director.h
View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> // Para manejar cadenas de texto #include <string> // Para manejar cadenas de texto
namespace lang namespace Lang
{ {
enum class Code : int; enum class Code : int;
} }
@@ -47,7 +47,7 @@ private:
void reset(); // Reinicia objetos y vuelve a la sección inicial void reset(); // Reinicia objetos y vuelve a la sección inicial
// --- Gestión de archivos de idioma --- // --- Gestión de archivos de idioma ---
std::string getLangFile(lang::Code code); // Obtiene un fichero de idioma según el código std::string getLangFile(Lang::Code code); // Obtiene un fichero de idioma según el código
// --- Apagado del sistema --- // --- Apagado del sistema ---
void shutdownSystem(bool should_shutdown); // Apaga el sistema void shutdownSystem(bool should_shutdown); // Apaga el sistema

38
source/game.cpp
View File

@@ -52,8 +52,8 @@ Game::Game(int player_id, int current_stage, bool demo)
demo_.enabled = demo; demo_.enabled = demo;
// Otras variables // Otras variables
section::name = section::Name::GAME; Section::name = Section::Name::GAME;
section::options = section::Options::NONE; Section::options = Section::Options::NONE;
Stage::init(); Stage::init();
Stage::number = current_stage; Stage::number = current_stage;
@@ -109,7 +109,7 @@ Game::~Game()
// [Modo JUEGO] Guarda puntuaciones y transita a modo título // [Modo JUEGO] Guarda puntuaciones y transita a modo título
auto manager = std::make_unique<ManageHiScoreTable>(options.game.hi_score_table); auto manager = std::make_unique<ManageHiScoreTable>(options.game.hi_score_table);
manager->saveToFile(Asset::get()->get("score.bin")); manager->saveToFile(Asset::get()->get("score.bin"));
section::attract_mode = section::AttractMode::TITLE_TO_DEMO; Section::attract_mode = Section::AttractMode::TITLE_TO_DEMO;
Audio::get()->stopMusic(); Audio::get()->stopMusic();
} }
@@ -276,7 +276,7 @@ void Game::updateStage()
else else
{ {
auto text = Resource::get()->getText("04b_25_2x"); auto text = Resource::get()->getText("04b_25_2x");
const std::string caption = std::to_string(10 - Stage::number) + lang::getText("[GAME_TEXT] 2"); const std::string caption = std::to_string(10 - Stage::number) + Lang::getText("[GAME_TEXT] 2");
createMessage(paths, text->writeToTexture(caption, 1, -4)); createMessage(paths, text->writeToTexture(caption, 1, -4));
} }
} }
@@ -338,14 +338,14 @@ void Game::updateGameStateGameOver()
if (game_completed_counter_ > 0) if (game_completed_counter_ > 0)
{ {
// Los jugadores han completado el juego // Los jugadores han completado el juego
section::name = section::Name::CREDITS; Section::name = Section::Name::CREDITS;
} }
else else
{ {
// La partida ha terminado con la derrota de los jugadores // La partida ha terminado con la derrota de los jugadores
section::name = section::Name::HI_SCORE_TABLE; Section::name = Section::Name::HI_SCORE_TABLE;
} }
section::options = section::Options::HI_SCORE_AFTER_PLAYING; Section::options = Section::Options::HI_SCORE_AFTER_PLAYING;
if (options.audio.enabled) if (options.audio.enabled)
{ {
Audio::get()->stopAllSounds(); Audio::get()->stopAllSounds();
@@ -1090,7 +1090,7 @@ void Game::disableTimeStopItem()
// Bucle para el juego // Bucle para el juego
void Game::run() void Game::run()
{ {
while (section::name == section::Name::GAME) while (Section::name == Section::Name::GAME)
{ {
#ifndef RECORDING #ifndef RECORDING
checkInput(); checkInput();
@@ -1233,7 +1233,7 @@ void Game::checkEvents()
#ifdef DEBUG #ifdef DEBUG
checkDebugEvents(event); checkDebugEvents(event);
#endif #endif
globalEvents::check(event); GlobalEvents::check(event);
} }
} }
@@ -1349,7 +1349,7 @@ void Game::checkInput()
} }
// Verifica los inputs globales. // Verifica los inputs globales.
globalInputs::check(); GlobalInputs::check();
} }
// Verifica si alguno de los controladores ha solicitado una pausa y actualiza el estado de pausa del juego. // Verifica si alguno de los controladores ha solicitado una pausa y actualiza el estado de pausa del juego.
@@ -1379,8 +1379,8 @@ void Game::DEMO_handlePassInput()
{ {
if (input_->checkAnyButtonPressed()) if (input_->checkAnyButtonPressed())
{ {
section::name = section::Name::TITLE; // Salir del modo demo y regresar al menú principal. Section::name = Section::Name::TITLE; // Salir del modo demo y regresar al menú principal.
section::attract_mode = section::AttractMode::TITLE_TO_DEMO; // El juego volverá a mostrar la demo Section::attract_mode = Section::AttractMode::TITLE_TO_DEMO; // El juego volverá a mostrar la demo
return; return;
} }
} }
@@ -1689,7 +1689,7 @@ void Game::initDifficultyVars()
// Variables relacionadas con la dificultad // Variables relacionadas con la dificultad
switch (difficulty_) switch (difficulty_)
{ {
case GameDifficulty::EASY: case DifficultyCode::EASY:
{ {
balloon_manager_->setDefaultBalloonSpeed(BALLOON_SPEED[0]); balloon_manager_->setDefaultBalloonSpeed(BALLOON_SPEED[0]);
difficulty_score_multiplier_ = 0.5f; difficulty_score_multiplier_ = 0.5f;
@@ -1697,7 +1697,7 @@ void Game::initDifficultyVars()
break; break;
} }
case GameDifficulty::NORMAL: case DifficultyCode::NORMAL:
{ {
balloon_manager_->setDefaultBalloonSpeed(BALLOON_SPEED[0]); balloon_manager_->setDefaultBalloonSpeed(BALLOON_SPEED[0]);
difficulty_score_multiplier_ = 1.0f; difficulty_score_multiplier_ = 1.0f;
@@ -1705,7 +1705,7 @@ void Game::initDifficultyVars()
break; break;
} }
case GameDifficulty::HARD: case DifficultyCode::HARD:
{ {
balloon_manager_->setDefaultBalloonSpeed(BALLOON_SPEED[4]); balloon_manager_->setDefaultBalloonSpeed(BALLOON_SPEED[4]);
difficulty_score_multiplier_ = 1.5f; difficulty_score_multiplier_ = 1.5f;
@@ -1727,12 +1727,12 @@ void Game::initPlayers(int player_id)
const int Y = param.game.play_area.rect.h - 30; const int Y = param.game.play_area.rect.h - 30;
players_.emplace_back(std::make_unique<Player>(1, param.game.play_area.first_quarter_x - 15, Y, demo_.enabled, param.game.play_area.rect, player_textures_[0], player_animations_)); players_.emplace_back(std::make_unique<Player>(1, param.game.play_area.first_quarter_x - 15, Y, demo_.enabled, param.game.play_area.rect, player_textures_[0], player_animations_));
players_.back()->setScoreBoardPanel(SCOREBOARD_LEFT_PANEL); players_.back()->setScoreBoardPanel(SCOREBOARD_LEFT_PANEL);
players_.back()->setName(lang::getText("[SCOREBOARD] 1")); players_.back()->setName(Lang::getText("[SCOREBOARD] 1"));
players_.back()->setController(getController(players_.back()->getId())); players_.back()->setController(getController(players_.back()->getId()));
players_.emplace_back(std::make_unique<Player>(2, param.game.play_area.third_quarter_x - 15, Y, demo_.enabled, param.game.play_area.rect, player_textures_[1], player_animations_)); players_.emplace_back(std::make_unique<Player>(2, param.game.play_area.third_quarter_x - 15, Y, demo_.enabled, param.game.play_area.rect, player_textures_[1], player_animations_));
players_.back()->setScoreBoardPanel(SCOREBOARD_RIGHT_PANEL); players_.back()->setScoreBoardPanel(SCOREBOARD_RIGHT_PANEL);
players_.back()->setName(lang::getText("[SCOREBOARD] 2")); players_.back()->setName(Lang::getText("[SCOREBOARD] 2"));
players_.back()->setController(getController(players_.back()->getId())); players_.back()->setController(getController(players_.back()->getId()));
// Activa el jugador que coincide con el "player_id" // Activa el jugador que coincide con el "player_id"
@@ -1783,7 +1783,7 @@ void Game::updateDemo()
// Si ha terminado el fundido, cambia de sección // Si ha terminado el fundido, cambia de sección
if (fade_out_->hasEnded()) if (fade_out_->hasEnded())
{ {
section::name = section::Name::HI_SCORE_TABLE; Section::name = Section::Name::HI_SCORE_TABLE;
return; return;
} }
} }
@@ -1935,7 +1935,7 @@ void Game::evaluateAndSetMenace()
// Actualiza la velocidad de los globos en funcion del poder acumulado de la fase // Actualiza la velocidad de los globos en funcion del poder acumulado de la fase
void Game::checkAndUpdateBalloonSpeed() void Game::checkAndUpdateBalloonSpeed()
{ {
if (difficulty_ != GameDifficulty::NORMAL) if (difficulty_ != DifficultyCode::NORMAL)
return; return;
const float percent = static_cast<float>(Stage::power) / Stage::get(Stage::number).power_to_complete; const float percent = static_cast<float>(Stage::power) / Stage::get(Stage::number).power_to_complete;

2
source/game.h
View File

@@ -139,7 +139,7 @@ private:
options.game.hi_score_table[0].score); // Máxima puntuación y nombre de quien la ostenta options.game.hi_score_table[0].score); // Máxima puntuación y nombre de quien la ostenta
Demo demo_; // Variable con todas las variables relacionadas con el modo demo Demo demo_; // Variable con todas las variables relacionadas con el modo demo
GameDifficulty difficulty_ = options.game.difficulty; // Dificultad del juego DifficultyCode difficulty_ = options.game.difficulty; // Dificultad del juego
Helper helper_; // Variable para gestionar las ayudas Helper helper_; // Variable para gestionar las ayudas
Uint64 ticks_ = 0; // Contador de ticks para ajustar la velocidad del programa Uint64 ticks_ = 0; // Contador de ticks para ajustar la velocidad del programa
bool coffee_machine_enabled_ = false; // Indica si hay una máquina de café en el terreno de juego bool coffee_machine_enabled_ = false; // Indica si hay una máquina de café en el terreno de juego

6
source/global_events.cpp
View File

@@ -3,7 +3,7 @@
#include "mouse.h" // Para handleEvent #include "mouse.h" // Para handleEvent
#include "section.h" // Para Name, Options, name, options #include "section.h" // Para Name, Options, name, options
namespace globalEvents namespace GlobalEvents
{ {
// Comprueba los eventos que se pueden producir en cualquier sección del juego // Comprueba los eventos que se pueden producir en cualquier sección del juego
void check(const SDL_Event &event) void check(const SDL_Event &event)
@@ -11,8 +11,8 @@ namespace globalEvents
switch (event.type) switch (event.type)
{ {
case SDL_EVENT_QUIT: // Evento de salida de la aplicación case SDL_EVENT_QUIT: // Evento de salida de la aplicación
section::name = section::Name::QUIT; Section::name = Section::Name::QUIT;
section::options = section::Options::NONE; Section::options = Section::Options::NONE;
return; return;
case SDL_EVENT_RENDER_DEVICE_RESET: case SDL_EVENT_RENDER_DEVICE_RESET:

2
source/global_events.h
View File

@@ -2,7 +2,7 @@
#include <SDL3/SDL_events.h> #include <SDL3/SDL_events.h>
namespace globalEvents namespace GlobalEvents
{ {
// Comprueba los eventos que se pueden producir en cualquier sección del juego // Comprueba los eventos que se pueden producir en cualquier sección del juego
void check(const SDL_Event &event); void check(const SDL_Event &event);

76
source/global_inputs.cpp
View File

@@ -14,7 +14,7 @@
#include "service_menu.h" // Para ServiceMenu #include "service_menu.h" // Para ServiceMenu
#include "utils.h" // Para boolToOnOff #include "utils.h" // Para boolToOnOff
namespace globalInputs namespace GlobalInputs
{ {
// Termina // Termina
void quit() void quit()
@@ -23,13 +23,13 @@ namespace globalInputs
if (Notifier::get()->checkCode(CODE)) if (Notifier::get()->checkCode(CODE))
{ {
// Si la notificación de salir está activa, cambia de sección // Si la notificación de salir está activa, cambia de sección
section::name = section::Name::QUIT; Section::name = Section::Name::QUIT;
section::options = section::Options::NONE; Section::options = Section::Options::NONE;
} }
else else
{ {
// Si la notificación de salir no está activa, muestra la notificación // Si la notificación de salir no está activa, muestra la notificación
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 01"), std::string()}, -1, CODE); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 01"), std::string()}, -1, CODE);
} }
} }
@@ -39,12 +39,12 @@ namespace globalInputs
const std::string CODE = "RESET"; const std::string CODE = "RESET";
if (Notifier::get()->checkCode(CODE)) if (Notifier::get()->checkCode(CODE))
{ {
section::name = section::Name::RESET; Section::name = Section::Name::RESET;
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 15")}); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 15")});
} }
else else
{ {
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 03"), std::string()}, -1, CODE); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 03"), std::string()}, -1, CODE);
} }
} }
@@ -60,32 +60,32 @@ namespace globalInputs
void toggleIntegerScale() void toggleIntegerScale()
{ {
Screen::get()->toggleIntegerScale(); Screen::get()->toggleIntegerScale();
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 12") + " " + boolToOnOff(options.video.integer_scale)}); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 12") + " " + boolToOnOff(options.video.integer_scale)});
} }
// Activa / desactiva el vsync // Activa / desactiva el vsync
void toggleVSync() void toggleVSync()
{ {
Screen::get()->toggleVSync(); Screen::get()->toggleVSync();
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 14") + " " + boolToOnOff(options.video.v_sync)}); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 14") + " " + boolToOnOff(options.video.v_sync)});
} }
// Activa o desactiva los shaders // Activa o desactiva los shaders
void toggleShaders() void toggleShaders()
{ {
Screen::get()->toggleShaders(); Screen::get()->toggleShaders();
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 13") + " " + boolToOnOff(options.video.shaders)}); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 13") + " " + boolToOnOff(options.video.shaders)});
} }
// Obtiene una fichero a partir de un lang::Code // Obtiene una fichero a partir de un lang::Code
std::string getLangFile(lang::Code code) std::string getLangFile(Lang::Code code)
{ {
switch (code) switch (code)
{ {
case lang::Code::VALENCIAN: case Lang::Code::VALENCIAN:
return Asset::get()->get("ba_BA.json"); return Asset::get()->get("ba_BA.json");
break; break;
case lang::Code::SPANISH: case Lang::Code::SPANISH:
return Asset::get()->get("es_ES.json"); return Asset::get()->get("es_ES.json");
break; break;
default: default:
@@ -95,14 +95,14 @@ namespace globalInputs
} }
// Obtiene una cadena a partir de un lang::Code // Obtiene una cadena a partir de un lang::Code
std::string getLangName(lang::Code code) std::string getLangName(Lang::Code code)
{ {
switch (code) switch (code)
{ {
case lang::Code::VALENCIAN: case Lang::Code::VALENCIAN:
return " \"ba_BA\""; return " \"ba_BA\"";
break; break;
case lang::Code::SPANISH: case Lang::Code::SPANISH:
return " \"es_ES\""; return " \"es_ES\"";
break; break;
default: default:
@@ -117,16 +117,16 @@ namespace globalInputs
const std::string CODE = "LANG"; const std::string CODE = "LANG";
if (Notifier::get()->checkCode(CODE)) if (Notifier::get()->checkCode(CODE))
{ {
options.game.language = lang::getNextLangCode(options.game.language); options.game.language = Lang::getNextLangCode(options.game.language);
lang::loadFromFile(getLangFile(static_cast<lang::Code>(options.game.language))); Lang::loadFromFile(getLangFile(static_cast<Lang::Code>(options.game.language)));
section::name = section::Name::RESET; Section::name = Section::Name::RESET;
section::options = section::Options::RELOAD; Section::options = Section::Options::RELOAD;
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 05") + getLangName(options.game.language)}); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 05") + getLangName(options.game.language)});
} }
else else
{ {
const auto NEXT = lang::getNextLangCode(options.game.language); const auto NEXT = Lang::getNextLangCode(options.game.language);
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 04") + getLangName(NEXT), std::string()}, -1, CODE); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 04") + getLangName(NEXT), std::string()}, -1, CODE);
} }
} }
@@ -134,24 +134,24 @@ namespace globalInputs
void toggleFireMode() void toggleFireMode()
{ {
options.game.autofire = !options.game.autofire; options.game.autofire = !options.game.autofire;
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 08") + " " + boolToOnOff(options.game.autofire)}); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 08") + " " + boolToOnOff(options.game.autofire)});
} }
// Salta una sección del juego // Salta una sección del juego
void skipSection() void skipSection()
{ {
switch (section::name) switch (Section::name)
{ {
case section::Name::INTRO: case Section::Name::INTRO:
Audio::get()->stopMusic(); Audio::get()->stopMusic();
/* Continua en el case de abajo */ /* Continua en el case de abajo */
case section::Name::LOGO: case Section::Name::LOGO:
case section::Name::HI_SCORE_TABLE: case Section::Name::HI_SCORE_TABLE:
case section::Name::INSTRUCTIONS: case Section::Name::INSTRUCTIONS:
{ {
section::name = section::Name::TITLE; Section::name = Section::Name::TITLE;
section::options = section::Options::TITLE_1; Section::options = Section::Options::TITLE_1;
section::attract_mode = section::AttractMode::TITLE_TO_DEMO; Section::attract_mode = Section::AttractMode::TITLE_TO_DEMO;
break; break;
} }
default: default:
@@ -169,7 +169,7 @@ namespace globalInputs
void toggleFullscreen() void toggleFullscreen()
{ {
Screen::get()->toggleFullscreen(); Screen::get()->toggleFullscreen();
const std::string MODE = options.video.fullscreen ? lang::getText("[NOTIFICATIONS] 11") : lang::getText("[NOTIFICATIONS] 10"); const std::string MODE = options.video.fullscreen ? Lang::getText("[NOTIFICATIONS] 11") : Lang::getText("[NOTIFICATIONS] 10");
Notifier::get()->show({MODE}); Notifier::get()->show({MODE});
} }
@@ -178,7 +178,7 @@ namespace globalInputs
{ {
if (Screen::get()->decWindowSize()) if (Screen::get()->decWindowSize())
{ {
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 09") + " x" + std::to_string(options.window.size)}); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 09") + " x" + std::to_string(options.window.size)});
} }
} }
@@ -187,7 +187,7 @@ namespace globalInputs
{ {
if (Screen::get()->incWindowSize()) if (Screen::get()->incWindowSize())
{ {
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 09") + " x" + std::to_string(options.window.size)}); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 09") + " x" + std::to_string(options.window.size)});
} }
} }
@@ -323,7 +323,7 @@ namespace globalInputs
if (Input::get()->checkInput(InputAction::WINDOW_FULLSCREEN, INPUT_DO_NOT_ALLOW_REPEAT, InputDeviceToUse::KEYBOARD)) if (Input::get()->checkInput(InputAction::WINDOW_FULLSCREEN, INPUT_DO_NOT_ALLOW_REPEAT, InputDeviceToUse::KEYBOARD))
{ {
Screen::get()->toggleFullscreen(); Screen::get()->toggleFullscreen();
const std::string MODE = options.video.fullscreen ? lang::getText("[NOTIFICATIONS] 11") : lang::getText("[NOTIFICATIONS] 10"); const std::string MODE = options.video.fullscreen ? Lang::getText("[NOTIFICATIONS] 11") : Lang::getText("[NOTIFICATIONS] 10");
Notifier::get()->show({MODE}); Notifier::get()->show({MODE});
return; return;
} }
@@ -333,7 +333,7 @@ namespace globalInputs
{ {
if (Screen::get()->decWindowSize()) if (Screen::get()->decWindowSize())
{ {
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 09") + " x" + std::to_string(options.window.size)}); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 09") + " x" + std::to_string(options.window.size)});
} }
return; return;
} }
@@ -343,7 +343,7 @@ namespace globalInputs
{ {
if (Screen::get()->incWindowSize()) if (Screen::get()->incWindowSize())
{ {
Notifier::get()->show({lang::getText("[NOTIFICATIONS] 09") + " x" + std::to_string(options.window.size)}); Notifier::get()->show({Lang::getText("[NOTIFICATIONS] 09") + " x" + std::to_string(options.window.size)});
} }
return; return;
} }

2
source/global_inputs.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
namespace globalInputs namespace GlobalInputs
{ {
// Comprueba los inputs que se pueden introducir en cualquier sección del juego // Comprueba los inputs que se pueden introducir en cualquier sección del juego
void check(); void check();

18
source/hiscore_table.cpp
View File

@@ -39,7 +39,7 @@ HiScoreTable::HiScoreTable()
background_fade_color_(Color(0, 0, 0)) background_fade_color_(Color(0, 0, 0))
{ {
// Inicializa el resto // Inicializa el resto
section::name = section::Name::HI_SCORE_TABLE; Section::name = Section::Name::HI_SCORE_TABLE;
SDL_SetTextureBlendMode(backbuffer_, SDL_BLENDMODE_BLEND); SDL_SetTextureBlendMode(backbuffer_, SDL_BLENDMODE_BLEND);
initFade(); initFade();
initBackground(); initBackground();
@@ -137,18 +137,18 @@ void HiScoreTable::checkEvents()
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) while (SDL_PollEvent(&event))
{ {
globalEvents::check(event); GlobalEvents::check(event);
} }
} }
// Comprueba las entradas // Comprueba las entradas
void HiScoreTable::checkInput() { globalInputs::check(); } void HiScoreTable::checkInput() { GlobalInputs::check(); }
// Bucle para la pantalla de instrucciones // Bucle para la pantalla de instrucciones
void HiScoreTable::run() void HiScoreTable::run()
{ {
Audio::get()->playMusic("title.ogg"); Audio::get()->playMusic("title.ogg");
while (section::name == section::Name::HI_SCORE_TABLE) while (Section::name == Section::Name::HI_SCORE_TABLE)
{ {
checkInput(); checkInput();
update(); update();
@@ -171,10 +171,10 @@ void HiScoreTable::updateFade()
if (fade_->hasEnded() && fade_mode_ == FadeMode::OUT) if (fade_->hasEnded() && fade_mode_ == FadeMode::OUT)
{ {
section::name = (section::options == section::Options::HI_SCORE_AFTER_PLAYING) Section::name = (Section::options == Section::Options::HI_SCORE_AFTER_PLAYING)
? section::Name::TITLE ? Section::Name::TITLE
: section::Name::INSTRUCTIONS; : Section::Name::INSTRUCTIONS;
section::options = section::Options::NONE; Section::options = Section::Options::NONE;
} }
} }
@@ -221,7 +221,7 @@ void HiScoreTable::createSprites()
const int first_line = (param.game.height - size) / 2; const int first_line = (param.game.height - size) / 2;
// Crea el sprite para el texto de cabecera // Crea el sprite para el texto de cabecera
header_ = std::make_unique<Sprite>(header_text->writeDXToTexture(TEXT_COLOR, lang::getText("[HIGHSCORE_TABLE] CAPTION"), -2, background_fade_color_.getInverse().lighten(25))); header_ = std::make_unique<Sprite>(header_text->writeDXToTexture(TEXT_COLOR, Lang::getText("[HIGHSCORE_TABLE] CAPTION"), -2, background_fade_color_.getInverse().lighten(25)));
header_->setPosition(param.game.game_area.center_x - (header_->getWidth() / 2), first_line); header_->setPosition(param.game.game_area.center_x - (header_->getWidth() / 2), first_line);
// Crea los sprites para las entradas en la tabla de puntuaciones // Crea los sprites para las entradas en la tabla de puntuaciones

44
source/instructions.cpp
View File

@@ -35,7 +35,7 @@ Instructions::Instructions()
SDL_SetTextureBlendMode(texture_, SDL_BLENDMODE_BLEND); SDL_SetTextureBlendMode(texture_, SDL_BLENDMODE_BLEND);
// Inicializa variables // Inicializa variables
section::name = section::Name::INSTRUCTIONS; Section::name = Section::Name::INSTRUCTIONS;
view_ = param.game.game_area.rect; view_ = param.game.game_area.rect;
// Inicializa objetos // Inicializa objetos
@@ -141,11 +141,11 @@ void Instructions::fillTexture()
// Calcula cual es el texto más largo de las descripciones de los items // Calcula cual es el texto más largo de las descripciones de los items
int lenght = 0; int lenght = 0;
const std::array<std::string, 5> ITEM_DESCRIPTIONS = { const std::array<std::string, 5> ITEM_DESCRIPTIONS = {
lang::getText("[INSTRUCTIONS] 07"), Lang::getText("[INSTRUCTIONS] 07"),
lang::getText("[INSTRUCTIONS] 08"), Lang::getText("[INSTRUCTIONS] 08"),
lang::getText("[INSTRUCTIONS] 09"), Lang::getText("[INSTRUCTIONS] 09"),
lang::getText("[INSTRUCTIONS] 10"), Lang::getText("[INSTRUCTIONS] 10"),
lang::getText("[INSTRUCTIONS] 11")}; Lang::getText("[INSTRUCTIONS] 11")};
for (const auto &desc : ITEM_DESCRIPTIONS) for (const auto &desc : ITEM_DESCRIPTIONS)
{ {
const int l = text_->lenght(desc); const int l = text_->lenght(desc);
@@ -154,24 +154,24 @@ void Instructions::fillTexture()
const int ANCHOR_ITEM = (param.game.width - (lenght + desp_x)) / 2; const int ANCHOR_ITEM = (param.game.width - (lenght + desp_x)) / 2;
// Escribe el texto de las instrucciones // Escribe el texto de las instrucciones
text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, first_line, lang::getText("[INSTRUCTIONS] 01"), 1, ORANGE_COLOR, 1, SHADOW_TEXT_COLOR); text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, first_line, Lang::getText("[INSTRUCTIONS] 01"), 1, ORANGE_COLOR, 1, SHADOW_TEXT_COLOR);
const int anchor1 = first_line + space_post_header; const int anchor1 = first_line + space_post_header;
text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, anchor1 + space_between_lines * 0, lang::getText("[INSTRUCTIONS] 02"), 1, NO_COLOR, 1, SHADOW_TEXT_COLOR); text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, anchor1 + space_between_lines * 0, Lang::getText("[INSTRUCTIONS] 02"), 1, NO_COLOR, 1, SHADOW_TEXT_COLOR);
text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, anchor1 + space_between_lines * 1, lang::getText("[INSTRUCTIONS] 03"), 1, NO_COLOR, 1, SHADOW_TEXT_COLOR); text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, anchor1 + space_between_lines * 1, Lang::getText("[INSTRUCTIONS] 03"), 1, NO_COLOR, 1, SHADOW_TEXT_COLOR);
text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, anchor1 + space_new_paragraph + space_between_lines * 2, lang::getText("[INSTRUCTIONS] 04"), 1, NO_COLOR, 1, SHADOW_TEXT_COLOR); text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, anchor1 + space_new_paragraph + space_between_lines * 2, Lang::getText("[INSTRUCTIONS] 04"), 1, NO_COLOR, 1, SHADOW_TEXT_COLOR);
text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, anchor1 + space_new_paragraph + space_between_lines * 3, lang::getText("[INSTRUCTIONS] 05"), 1, NO_COLOR, 1, SHADOW_TEXT_COLOR); text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, anchor1 + space_new_paragraph + space_between_lines * 3, Lang::getText("[INSTRUCTIONS] 05"), 1, NO_COLOR, 1, SHADOW_TEXT_COLOR);
// Escribe el texto de los objetos y sus puntos // Escribe el texto de los objetos y sus puntos
const int anchor2 = anchor1 + space_pre_header + space_new_paragraph + space_between_lines * 3; const int anchor2 = anchor1 + space_pre_header + space_new_paragraph + space_between_lines * 3;
text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, anchor2, lang::getText("[INSTRUCTIONS] 06"), 1, ORANGE_COLOR, 1, SHADOW_TEXT_COLOR); text_->writeDX(TEXT_CENTER | TEXT_COLOR | TEXT_SHADOW, param.game.game_area.center_x, anchor2, Lang::getText("[INSTRUCTIONS] 06"), 1, ORANGE_COLOR, 1, SHADOW_TEXT_COLOR);
const int anchor3 = anchor2 + space_post_header; const int anchor3 = anchor2 + space_post_header;
text_->writeShadowed(ANCHOR_ITEM + desp_x, anchor3 + space_between_item_lines * 0, lang::getText("[INSTRUCTIONS] 07"), SHADOW_TEXT_COLOR); text_->writeShadowed(ANCHOR_ITEM + desp_x, anchor3 + space_between_item_lines * 0, Lang::getText("[INSTRUCTIONS] 07"), SHADOW_TEXT_COLOR);
text_->writeShadowed(ANCHOR_ITEM + desp_x, anchor3 + space_between_item_lines * 1, lang::getText("[INSTRUCTIONS] 08"), SHADOW_TEXT_COLOR); text_->writeShadowed(ANCHOR_ITEM + desp_x, anchor3 + space_between_item_lines * 1, Lang::getText("[INSTRUCTIONS] 08"), SHADOW_TEXT_COLOR);
text_->writeShadowed(ANCHOR_ITEM + desp_x, anchor3 + space_between_item_lines * 2, lang::getText("[INSTRUCTIONS] 09"), SHADOW_TEXT_COLOR); text_->writeShadowed(ANCHOR_ITEM + desp_x, anchor3 + space_between_item_lines * 2, Lang::getText("[INSTRUCTIONS] 09"), SHADOW_TEXT_COLOR);
text_->writeShadowed(ANCHOR_ITEM + desp_x, anchor3 + space_between_item_lines * 3, lang::getText("[INSTRUCTIONS] 10"), SHADOW_TEXT_COLOR); text_->writeShadowed(ANCHOR_ITEM + desp_x, anchor3 + space_between_item_lines * 3, Lang::getText("[INSTRUCTIONS] 10"), SHADOW_TEXT_COLOR);
text_->writeShadowed(ANCHOR_ITEM + desp_x, anchor3 + space_between_item_lines * 4, lang::getText("[INSTRUCTIONS] 11"), SHADOW_TEXT_COLOR); text_->writeShadowed(ANCHOR_ITEM + desp_x, anchor3 + space_between_item_lines * 4, Lang::getText("[INSTRUCTIONS] 11"), SHADOW_TEXT_COLOR);
// Deja el renderizador como estaba // Deja el renderizador como estaba
SDL_SetRenderTarget(renderer_, temp); SDL_SetRenderTarget(renderer_, temp);
@@ -266,18 +266,18 @@ void Instructions::checkEvents()
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) while (SDL_PollEvent(&event))
{ {
globalEvents::check(event); GlobalEvents::check(event);
} }
} }
// Comprueba las entradas // Comprueba las entradas
void Instructions::checkInput() { globalInputs::check(); } void Instructions::checkInput() { GlobalInputs::check(); }
// Bucle para la pantalla de instrucciones // Bucle para la pantalla de instrucciones
void Instructions::run() void Instructions::run()
{ {
Audio::get()->playMusic("title.ogg"); Audio::get()->playMusic("title.ogg");
while (section::name == section::Name::INSTRUCTIONS) while (Section::name == Section::Name::INSTRUCTIONS)
{ {
checkInput(); checkInput();
update(); update();
@@ -368,7 +368,7 @@ void Instructions::updateBackbuffer()
// Comprueba si el contador ha llegado al final // Comprueba si el contador ha llegado al final
if (all_lines_off_screen_) if (all_lines_off_screen_)
{ {
section::name = section::Name::TITLE; Section::name = Section::Name::TITLE;
section::options = section::Options::TITLE_1; Section::options = Section::Options::TITLE_1;
} }
} }

32
source/intro.cpp
View File

@@ -28,8 +28,8 @@ Intro::Intro()
: tiled_bg_(std::make_unique<TiledBG>(param.game.game_area.rect, TiledBGMode::DIAGONAL)) : tiled_bg_(std::make_unique<TiledBG>(param.game.game_area.rect, TiledBGMode::DIAGONAL))
{ {
// Inicializa variables // Inicializa variables
section::name = section::Name::INTRO; Section::name = Section::Name::INTRO;
section::options = section::Options::NONE; Section::options = Section::Options::NONE;
// Inicializa las imagens // Inicializa las imagens
initSprites(); initSprites();
@@ -48,12 +48,12 @@ void Intro::checkEvents()
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) while (SDL_PollEvent(&event))
{ {
globalEvents::check(event); GlobalEvents::check(event);
} }
} }
// Comprueba las entradas // Comprueba las entradas
void Intro::checkInput() { globalInputs::check(); } void Intro::checkInput() { GlobalInputs::check(); }
// Actualiza las escenas de la intro // Actualiza las escenas de la intro
void Intro::updateScenes() void Intro::updateScenes()
@@ -282,7 +282,7 @@ void Intro::render()
void Intro::run() void Intro::run()
{ {
Audio::get()->playMusic("intro.ogg", 0); Audio::get()->playMusic("intro.ogg", 0);
while (section::name == section::Name::INTRO) while (Section::name == Section::Name::INTRO)
{ {
checkInput(); checkInput();
update(); update();
@@ -396,39 +396,39 @@ void Intro::initTexts()
} }
// Un dia qualsevol de l'any 2000 // Un dia qualsevol de l'any 2000
texts_.at(0)->setCaption(lang::getText("[INTRO] 1")); texts_.at(0)->setCaption(Lang::getText("[INTRO] 1"));
texts_.at(0)->setSpeed(8); texts_.at(0)->setSpeed(8);
// Tot esta tranquil a la UPV // Tot esta tranquil a la UPV
texts_.at(1)->setCaption(lang::getText("[INTRO] 2")); texts_.at(1)->setCaption(Lang::getText("[INTRO] 2"));
texts_.at(1)->setSpeed(8); texts_.at(1)->setSpeed(8);
// Fins que un desaprensiu... // Fins que un desaprensiu...
texts_.at(2)->setCaption(lang::getText("[INTRO] 3")); texts_.at(2)->setCaption(Lang::getText("[INTRO] 3"));
texts_.at(2)->setSpeed(12); texts_.at(2)->setSpeed(12);
// HEY! ME ANE A FERME UN CORTAET... // HEY! ME ANE A FERME UN CORTAET...
texts_.at(3)->setCaption(lang::getText("[INTRO] 4")); texts_.at(3)->setCaption(Lang::getText("[INTRO] 4"));
texts_.at(3)->setSpeed(8); texts_.at(3)->setSpeed(8);
// UAAAAAAAAAAAAA!!! // UAAAAAAAAAAAAA!!!
texts_.at(4)->setCaption(lang::getText("[INTRO] 5")); texts_.at(4)->setCaption(Lang::getText("[INTRO] 5"));
texts_.at(4)->setSpeed(1); texts_.at(4)->setSpeed(1);
// Espera un moment... // Espera un moment...
texts_.at(5)->setCaption(lang::getText("[INTRO] 6")); texts_.at(5)->setCaption(Lang::getText("[INTRO] 6"));
texts_.at(5)->setSpeed(16); texts_.at(5)->setSpeed(16);
// Si resulta que no tinc solt! // Si resulta que no tinc solt!
texts_.at(6)->setCaption(lang::getText("[INTRO] 7")); texts_.at(6)->setCaption(Lang::getText("[INTRO] 7"));
texts_.at(6)->setSpeed(2); texts_.at(6)->setSpeed(2);
// MERDA DE MAQUINA! // MERDA DE MAQUINA!
texts_.at(7)->setCaption(lang::getText("[INTRO] 8")); texts_.at(7)->setCaption(Lang::getText("[INTRO] 8"));
texts_.at(7)->setSpeed(3); texts_.at(7)->setSpeed(3);
// Blop... blop... blop... // Blop... blop... blop...
texts_.at(8)->setCaption(lang::getText("[INTRO] 9")); texts_.at(8)->setCaption(Lang::getText("[INTRO] 9"));
texts_.at(8)->setSpeed(20); texts_.at(8)->setSpeed(20);
for (auto &text : texts_) for (auto &text : texts_)
@@ -514,8 +514,8 @@ void Intro::updatePostState()
if (ELAPSED_TIME >= 1000) if (ELAPSED_TIME >= 1000)
{ {
Audio::get()->stopMusic(); Audio::get()->stopMusic();
section::name = section::Name::TITLE; Section::name = Section::Name::TITLE;
section::options = section::Options::TITLE_1; Section::options = Section::Options::TITLE_1;
} }
break; break;

10
source/lang.cpp
View File

@@ -7,7 +7,7 @@
using json = nlohmann::json; using json = nlohmann::json;
namespace lang namespace Lang
{ {
std::unordered_map<std::string, std::string> texts; std::unordered_map<std::string, std::string> texts;
@@ -101,13 +101,13 @@ namespace lang
switch (lang.code) switch (lang.code)
{ {
case Code::SPANISH: case Code::SPANISH:
lang.name = lang::getText("[SERVICE_MENU] LANG_ES"); lang.name = Lang::getText("[SERVICE_MENU] LANG_ES");
break; break;
case Code::VALENCIAN: case Code::VALENCIAN:
lang.name = lang::getText("[SERVICE_MENU] LANG_BA"); lang.name = Lang::getText("[SERVICE_MENU] LANG_BA");
break; break;
case Code::ENGLISH: case Code::ENGLISH:
lang.name = lang::getText("[SERVICE_MENU] LANG_EN"); lang.name = Lang::getText("[SERVICE_MENU] LANG_EN");
break; break;
default: default:
lang.name = "Unknown"; lang.name = "Unknown";
@@ -117,7 +117,7 @@ namespace lang
} }
// Obtiene una fichero a partir de un lang::Code // Obtiene una fichero a partir de un lang::Code
std::string getLanguageFileName(lang::Code code) std::string getLanguageFileName(Lang::Code code)
{ {
for (const auto &lang : languages) for (const auto &lang : languages)
{ {

2
source/lang.h
View File

@@ -3,7 +3,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
namespace lang namespace Lang
{ {
// --- Códigos de idioma soportados --- // --- Códigos de idioma soportados ---
enum class Code : int enum class Code : int

10
source/logo.cpp
View File

@@ -21,7 +21,7 @@ Logo::Logo()
{ {
// Inicializa variables // Inicializa variables
section::name = section::Name::LOGO; Section::name = Section::Name::LOGO;
dest_.x = param.game.game_area.center_x - jail_texture_->getWidth() / 2; dest_.x = param.game.game_area.center_x - jail_texture_->getWidth() / 2;
dest_.y = param.game.game_area.center_y - jail_texture_->getHeight() / 2; dest_.y = param.game.game_area.center_y - jail_texture_->getHeight() / 2;
since_sprite_->setPosition(SDL_FRect{ since_sprite_->setPosition(SDL_FRect{
@@ -69,12 +69,12 @@ void Logo::checkEvents()
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) while (SDL_PollEvent(&event))
{ {
globalEvents::check(event); GlobalEvents::check(event);
} }
} }
// Comprueba las entradas // Comprueba las entradas
void Logo::checkInput() { globalInputs::check(); } void Logo::checkInput() { GlobalInputs::check(); }
// Gestiona el logo de JAILGAMES // Gestiona el logo de JAILGAMES
void Logo::updateJAILGAMES() void Logo::updateJAILGAMES()
@@ -113,7 +113,7 @@ void Logo::updateJAILGAMES()
// Comprueba si ha terminado el logo // Comprueba si ha terminado el logo
if (counter_ == END_LOGO_COUNTER_MARK + POST_LOGO_DURATION) if (counter_ == END_LOGO_COUNTER_MARK + POST_LOGO_DURATION)
{ {
section::name = section::Name::INTRO; Section::name = Section::Name::INTRO;
} }
} }
@@ -179,7 +179,7 @@ void Logo::render()
void Logo::run() void Logo::run()
{ {
Audio::get()->fadeOutMusic(300); Audio::get()->fadeOutMusic(300);
while (section::name == section::Name::LOGO) while (Section::name == Section::Name::LOGO)
{ {
checkInput(); checkInput();
update(); update();

205
source/options.cpp
View File

@@ -8,51 +8,56 @@
#include "lang.h" // Para Code #include "lang.h" // Para Code
#include "utils.h" // Para boolToString, stringToBool, getFileName #include "utils.h" // Para boolToString, stringToBool, getFileName
// Variables namespace Options
Options options; {
// Vector con las dificultades
std::vector<Difficulty> difficulties = {
{DifficultyCode::EASY, "Easy"},
{DifficultyCode::NORMAL, "Normal"},
{DifficultyCode::HARD, "Hard"}};
// Declaraciones // Declaraciones
bool setOptions(const std::string &var, const std::string &value); bool setOptions(const std::string &var, const std::string &value);
// Inicializa las opciones del programa // Inicializa las opciones del programa
void initOptions() void initOptions()
{ {
options.window.caption = "Coffee Crisis Arcade Edition"; window.caption = "Coffee Crisis Arcade Edition";
options.window.size = 2; window.size = 2;
// Opciones de video // Opciones de video
options.video.fullscreen = false; video.fullscreen = false;
options.video.scale_mode = SDL_ScaleMode::SDL_SCALEMODE_NEAREST; video.scale_mode = SDL_ScaleMode::SDL_SCALEMODE_NEAREST;
options.video.v_sync = true; video.v_sync = true;
options.video.integer_scale = true; video.integer_scale = true;
options.video.shaders = false; video.shaders = false;
// Opciones de audio // Opciones de audio
options.audio.enabled = true; audio.enabled = true;
options.audio.volume = 100; audio.volume = 100;
options.audio.music.enabled = true; audio.music.enabled = true;
options.audio.music.volume = 100; audio.music.volume = 100;
options.audio.sound.enabled = true; audio.sound.enabled = true;
options.audio.sound.volume = 50; audio.sound.volume = 50;
// Opciones de juego // Opciones de juego
options.game.difficulty = GameDifficulty::NORMAL; game.difficulty = DifficultyCode::NORMAL;
options.game.language = lang::Code::VALENCIAN; game.language = Lang::Code::VALENCIAN;
options.game.autofire = true; game.autofire = true;
options.game.shutdown_enabled = false; game.shutdown_enabled = false;
options.game.clearLastHiScoreEntries(); game.clearLastHiScoreEntries();
// Opciones de control // Opciones de control
options.controllers.clear(); controllers.clear();
options.controllers.resize(2); controllers.resize(2);
options.controllers.at(0).player_id = 1; controllers.at(0).player_id = 1;
options.controllers.at(1).player_id = 2; controllers.at(1).player_id = 2;
setKeyboardToPlayer(1); setKeyboardToPlayer(1);
// Opciones pendientes // Opciones pendientes
options.pending_changes.new_language = options.game.language; pending_changes.new_language = game.language;
options.pending_changes.new_difficulty = options.game.difficulty; pending_changes.new_difficulty = game.difficulty;
options.pending_changes.has_pending_changes = false; pending_changes.has_pending_changes = false;
} }
// Carga el fichero de configuración // Carga el fichero de configuración
@@ -98,11 +103,11 @@ bool loadOptionsFile(std::string file_path)
} }
// Normaliza los valores // Normaliza los valores
if (options.game.language != lang::Code::ENGLISH && if (game.language != Lang::Code::ENGLISH &&
options.game.language != lang::Code::VALENCIAN && game.language != Lang::Code::VALENCIAN &&
options.game.language != lang::Code::SPANISH) game.language != Lang::Code::SPANISH)
{ {
options.game.language = lang::Code::ENGLISH; game.language = Lang::Code::ENGLISH;
} }
return success; return success;
@@ -128,41 +133,41 @@ bool saveOptionsFile(std::string file_path)
file << "## video.scale_mode [" << static_cast<int>(SDL_ScaleMode::SDL_SCALEMODE_NEAREST) << ": nearest, " << static_cast<int>(SDL_ScaleMode::SDL_SCALEMODE_LINEAR) << ": lineal]\n"; file << "## video.scale_mode [" << static_cast<int>(SDL_ScaleMode::SDL_SCALEMODE_NEAREST) << ": nearest, " << static_cast<int>(SDL_ScaleMode::SDL_SCALEMODE_LINEAR) << ": lineal]\n";
file << "\n"; file << "\n";
file << "window.zoom=" << options.window.size << "\n"; file << "window.zoom=" << window.size << "\n";
file << "video.fullscreen=" << boolToString(options.video.fullscreen) << "\n"; file << "video.fullscreen=" << boolToString(video.fullscreen) << "\n";
file << "video.scale_mode=" << static_cast<int>(options.video.scale_mode) << "\n"; file << "video.scale_mode=" << static_cast<int>(video.scale_mode) << "\n";
file << "video.v_sync=" << boolToString(options.video.v_sync) << "\n"; file << "video.v_sync=" << boolToString(video.v_sync) << "\n";
file << "video.integer_scale=" << boolToString(options.video.integer_scale) << "\n"; file << "video.integer_scale=" << boolToString(video.integer_scale) << "\n";
file << "video.shaders=" << boolToString(options.video.shaders) << "\n"; file << "video.shaders=" << boolToString(video.shaders) << "\n";
// Opciones de audio // Opciones de audio
file << "\n\n## AUDIO\n"; file << "\n\n## AUDIO\n";
file << "## volume [0 .. 100]\n"; file << "## volume [0 .. 100]\n";
file << "\n"; file << "\n";
file << "audio.enabled=" << boolToString(options.audio.enabled) << "\n"; file << "audio.enabled=" << boolToString(audio.enabled) << "\n";
file << "audio.volume=" << options.audio.volume << "\n"; file << "audio.volume=" << audio.volume << "\n";
file << "audio.music.enabled=" << boolToString(options.audio.music.enabled) << "\n"; file << "audio.music.enabled=" << boolToString(audio.music.enabled) << "\n";
file << "audio.music.volume=" << options.audio.music.volume << "\n"; file << "audio.music.volume=" << audio.music.volume << "\n";
file << "audio.sound.enabled=" << boolToString(options.audio.sound.enabled) << "\n"; file << "audio.sound.enabled=" << boolToString(audio.sound.enabled) << "\n";
file << "audio.sound.volume=" << options.audio.sound.volume << "\n"; file << "audio.sound.volume=" << audio.sound.volume << "\n";
// Opciones del juego // Opciones del juego
file << "\n\n## GAME\n"; file << "\n\n## GAME\n";
file << "## game.language [0: spanish, 1: valencian, 2: english]\n"; file << "## game.language [0: spanish, 1: valencian, 2: english]\n";
file << "## game.difficulty [" << static_cast<int>(GameDifficulty::EASY) << ": easy, " << static_cast<int>(GameDifficulty::NORMAL) << ": normal, " << static_cast<int>(GameDifficulty::HARD) << ": hard]\n"; file << "## game.difficulty [" << static_cast<int>(DifficultyCode::EASY) << ": easy, " << static_cast<int>(DifficultyCode::NORMAL) << ": normal, " << static_cast<int>(DifficultyCode::HARD) << ": hard]\n";
file << "\n"; file << "\n";
file << "game.language=" << static_cast<int>(options.game.language) << "\n"; file << "game.language=" << static_cast<int>(game.language) << "\n";
file << "game.difficulty=" << static_cast<int>(options.game.difficulty) << "\n"; file << "game.difficulty=" << static_cast<int>(game.difficulty) << "\n";
file << "game.autofire=" << boolToString(options.game.autofire) << "\n"; file << "game.autofire=" << boolToString(game.autofire) << "\n";
file << "game.shutdown_enabled=" << boolToString(options.game.shutdown_enabled) << "\n"; file << "game.shutdown_enabled=" << boolToString(game.shutdown_enabled) << "\n";
// Opciones de mandos // Opciones de mandos
file << "\n\n## CONTROLLERS\n"; file << "\n\n## CONTROLLERS\n";
int controller_index = 0; int controller_index = 0;
for (const auto &controller : options.controllers) for (const auto &controller : controllers)
{ {
file << "\n"; file << "\n";
file << "controller." << controller_index << ".name=" << controller.name << "\n"; file << "controller." << controller_index << ".name=" << controller.name << "\n";
@@ -193,139 +198,139 @@ bool setOptions(const std::string &var, const std::string &value)
// Opciones de video // Opciones de video
if (var == "video.fullscreen") if (var == "video.fullscreen")
{ {
options.video.fullscreen = stringToBool(value); video.fullscreen = stringToBool(value);
} }
else if (var == "window.zoom") else if (var == "window.zoom")
{ {
options.window.size = std::stoi(value); window.size = std::stoi(value);
} }
else if (var == "video.scale_mode") else if (var == "video.scale_mode")
{ {
options.video.scale_mode = static_cast<SDL_ScaleMode>(std::stoi(value)); video.scale_mode = static_cast<SDL_ScaleMode>(std::stoi(value));
} }
else if (var == "video.shaders") else if (var == "video.shaders")
{ {
options.video.shaders = stringToBool(value); video.shaders = stringToBool(value);
} }
else if (var == "video.integer_scale") else if (var == "video.integer_scale")
{ {
options.video.integer_scale = stringToBool(value); video.integer_scale = stringToBool(value);
} }
else if (var == "video.v_sync") else if (var == "video.v_sync")
{ {
options.video.v_sync = stringToBool(value); video.v_sync = stringToBool(value);
} }
// Opciones de audio // Opciones de audio
else if (var == "audio.enabled") else if (var == "audio.enabled")
{ {
options.audio.enabled = stringToBool(value); audio.enabled = stringToBool(value);
} }
else if (var == "audio.volume") else if (var == "audio.volume")
{ {
options.audio.volume = std::clamp(std::stoi(value), 0, 100); audio.volume = std::clamp(std::stoi(value), 0, 100);
} }
else if (var == "audio.music.enabled") else if (var == "audio.music.enabled")
{ {
options.audio.music.enabled = stringToBool(value); audio.music.enabled = stringToBool(value);
} }
else if (var == "audio.music.volume") else if (var == "audio.music.volume")
{ {
options.audio.music.volume = std::clamp(std::stoi(value), 0, 100); audio.music.volume = std::clamp(std::stoi(value), 0, 100);
} }
else if (var == "audio.sound.enabled") else if (var == "audio.sound.enabled")
{ {
options.audio.sound.enabled = stringToBool(value); audio.sound.enabled = stringToBool(value);
} }
else if (var == "audio.sound.volume") else if (var == "audio.sound.volume")
{ {
options.audio.sound.volume = std::clamp(std::stoi(value), 0, 100); audio.sound.volume = std::clamp(std::stoi(value), 0, 100);
} }
// Opciones de juego // Opciones de juego
else if (var == "game.language") else if (var == "game.language")
{ {
options.game.language = static_cast<lang::Code>(std::stoi(value)); game.language = static_cast<Lang::Code>(std::stoi(value));
options.pending_changes.new_language = options.game.language; pending_changes.new_language = game.language;
} }
else if (var == "game.difficulty") else if (var == "game.difficulty")
{ {
options.game.difficulty = static_cast<GameDifficulty>(std::stoi(value)); game.difficulty = static_cast<DifficultyCode>(std::stoi(value));
options.pending_changes.new_difficulty = options.game.difficulty; pending_changes.new_difficulty = game.difficulty;
} }
else if (var == "game.autofire") else if (var == "game.autofire")
{ {
options.game.autofire = stringToBool(value); game.autofire = stringToBool(value);
} }
else if (var == "game.shutdown_enabled") else if (var == "game.shutdown_enabled")
{ {
options.game.shutdown_enabled = stringToBool(value); game.shutdown_enabled = stringToBool(value);
} }
// Opciones de mandos // Opciones de mandos
else if (var == "controller.0.name") else if (var == "controller.0.name")
{ {
options.controllers.at(0).name = value; controllers.at(0).name = value;
} }
else if (var == "controller.0.player") else if (var == "controller.0.player")
{ {
options.controllers.at(0).player_id = std::clamp(std::stoi(value), 1, 2); controllers.at(0).player_id = std::clamp(std::stoi(value), 1, 2);
} }
else if (var == "controller.0.type") else if (var == "controller.0.type")
{ {
options.controllers.at(0).type = static_cast<InputDeviceToUse>(std::stoi(value)); controllers.at(0).type = static_cast<InputDeviceToUse>(std::stoi(value));
} }
else if (var == "controller.0.button.fire_left") else if (var == "controller.0.button.fire_left")
{ {
options.controllers.at(0).buttons.at(0) = static_cast<SDL_GamepadButton>(std::stoi(value)); controllers.at(0).buttons.at(0) = static_cast<SDL_GamepadButton>(std::stoi(value));
} }
else if (var == "controller.0.button.fire_center") else if (var == "controller.0.button.fire_center")
{ {
options.controllers.at(0).buttons.at(1) = static_cast<SDL_GamepadButton>(std::stoi(value)); controllers.at(0).buttons.at(1) = static_cast<SDL_GamepadButton>(std::stoi(value));
} }
else if (var == "controller.0.button.fire_right") else if (var == "controller.0.button.fire_right")
{ {
options.controllers.at(0).buttons.at(2) = static_cast<SDL_GamepadButton>(std::stoi(value)); controllers.at(0).buttons.at(2) = static_cast<SDL_GamepadButton>(std::stoi(value));
} }
else if (var == "controller.0.button.start") else if (var == "controller.0.button.start")
{ {
options.controllers.at(0).buttons.at(3) = static_cast<SDL_GamepadButton>(std::stoi(value)); controllers.at(0).buttons.at(3) = static_cast<SDL_GamepadButton>(std::stoi(value));
} }
else if (var == "controller.0.button.service") else if (var == "controller.0.button.service")
{ {
options.controllers.at(0).buttons.at(4) = static_cast<SDL_GamepadButton>(std::stoi(value)); controllers.at(0).buttons.at(4) = static_cast<SDL_GamepadButton>(std::stoi(value));
} }
else if (var == "controller.1.name") else if (var == "controller.1.name")
{ {
options.controllers.at(1).name = value; controllers.at(1).name = value;
} }
else if (var == "controller.1.player") else if (var == "controller.1.player")
{ {
options.controllers.at(1).player_id = std::clamp(std::stoi(value), 1, 2); controllers.at(1).player_id = std::clamp(std::stoi(value), 1, 2);
} }
else if (var == "controller.1.type") else if (var == "controller.1.type")
{ {
options.controllers.at(1).type = static_cast<InputDeviceToUse>(std::stoi(value)); controllers.at(1).type = static_cast<InputDeviceToUse>(std::stoi(value));
} }
else if (var == "controller.1.button.fire_left") else if (var == "controller.1.button.fire_left")
{ {
options.controllers.at(1).buttons.at(0) = static_cast<SDL_GamepadButton>(std::stoi(value)); controllers.at(1).buttons.at(0) = static_cast<SDL_GamepadButton>(std::stoi(value));
} }
else if (var == "controller.1.button.fire_center") else if (var == "controller.1.button.fire_center")
{ {
options.controllers.at(1).buttons.at(1) = static_cast<SDL_GamepadButton>(std::stoi(value)); controllers.at(1).buttons.at(1) = static_cast<SDL_GamepadButton>(std::stoi(value));
} }
else if (var == "controller.1.button.fire_right") else if (var == "controller.1.button.fire_right")
{ {
options.controllers.at(1).buttons.at(2) = static_cast<SDL_GamepadButton>(std::stoi(value)); controllers.at(1).buttons.at(2) = static_cast<SDL_GamepadButton>(std::stoi(value));
} }
else if (var == "controller.1.button.start") else if (var == "controller.1.button.start")
{ {
options.controllers.at(1).buttons.at(3) = static_cast<SDL_GamepadButton>(std::stoi(value)); controllers.at(1).buttons.at(3) = static_cast<SDL_GamepadButton>(std::stoi(value));
} }
else if (var == "controller.1.button.service") else if (var == "controller.1.button.service")
{ {
options.controllers.at(1).buttons.at(4) = static_cast<SDL_GamepadButton>(std::stoi(value)); controllers.at(1).buttons.at(4) = static_cast<SDL_GamepadButton>(std::stoi(value));
} }
// Lineas vacias o que empiezan por comentario // Lineas vacias o que empiezan por comentario
@@ -343,7 +348,7 @@ bool setOptions(const std::string &var, const std::string &value)
// Asigna el teclado al jugador // Asigna el teclado al jugador
void setKeyboardToPlayer(int player_id) void setKeyboardToPlayer(int player_id)
{ {
for (auto &controller : options.controllers) for (auto &controller : controllers)
{ {
if (controller.player_id == player_id) if (controller.player_id == player_id)
{ {
@@ -359,20 +364,20 @@ void setKeyboardToPlayer(int player_id)
// Intercambia el teclado de jugador // Intercambia el teclado de jugador
void swapOptionsKeyboard() void swapOptionsKeyboard()
{ {
std::swap(options.controllers.at(0).type, options.controllers.at(1).type); std::swap(controllers.at(0).type, controllers.at(1).type);
} }
// Intercambia los jugadores asignados a los dos primeros mandos // Intercambia los jugadores asignados a los dos primeros mandos
void swapOptionsControllers() void swapOptionsControllers()
{ {
std::swap(options.controllers.at(0).player_id, options.controllers.at(1).player_id); std::swap(controllers.at(0).player_id, controllers.at(1).player_id);
std::swap(options.controllers.at(0).type, options.controllers.at(1).type); std::swap(controllers.at(0).type, controllers.at(1).type);
} }
// Averigua quien está usando el teclado // Averigua quien está usando el teclado
int getPlayerWhoUsesKeyboard() int getPlayerWhoUsesKeyboard()
{ {
for (const auto &controller : options.controllers) for (const auto &controller : controllers)
{ {
if (controller.type == InputDeviceToUse::ANY) if (controller.type == InputDeviceToUse::ANY)
{ {
@@ -385,10 +390,24 @@ int getPlayerWhoUsesKeyboard()
// Aplica los cambios pendientes copiando los valores a sus variables // Aplica los cambios pendientes copiando los valores a sus variables
void applyPendingChanges() void applyPendingChanges()
{ {
if (options.pending_changes.has_pending_changes) if (pending_changes.has_pending_changes)
{ {
options.game.language = options.pending_changes.new_language; game.language = pending_changes.new_language;
options.game.difficulty = options.pending_changes.new_difficulty; game.difficulty = pending_changes.new_difficulty;
options.pending_changes.has_pending_changes = false; pending_changes.has_pending_changes = false;
} }
} }
void checkPendingChanges()
{
if (game.language != pending_changes.new_language ||
game.difficulty != pending_changes.new_difficulty)
{
pending_changes.has_pending_changes = true;
}
else
{
pending_changes.has_pending_changes = false;
}
}
} // namespace Options

120
source/options.h
View File

@@ -7,66 +7,78 @@
#include "input.h" // Para InputAction, InputDeviceToUse #include "input.h" // Para InputAction, InputDeviceToUse
#include "manage_hiscore_table.h" // Para HiScoreEntry #include "manage_hiscore_table.h" // Para HiScoreEntry
namespace lang namespace Lang
{ {
enum class Code : int; enum class Code : int;
} }
// --- Dificultad del juego --- namespace Options
enum class GameDifficulty
{ {
// --- Dificultad del juego ---
enum class DifficultyCode
{
EASY = 0, EASY = 0,
NORMAL = 1, NORMAL = 1,
HARD = 2, HARD = 2,
}; };
// --- Opciones de la ventana --- // --- Estructura que representa un nivel de dificultad
struct WindowOptions struct Difficulty
{ {
DifficultyCode code; // Código que identifica la dificultad
std::string name; // Nombre que identifica la dificultad
Difficulty(DifficultyCode c, const std::string &n)
: code(c), name(n) {}
};
// --- Opciones de la ventana ---
struct WindowOptions
{
std::string caption; // Texto que aparece en la barra de título de la ventana std::string caption; // Texto que aparece en la barra de título de la ventana
int size = 1; // Valor por el que se multiplica el tamaño de la ventana int size = 1; // Valor por el que se multiplica el tamaño de la ventana
int max_size = 1; // Tamaño máximo para que la ventana no sea mayor que la pantalla int max_size = 1; // Tamaño máximo para que la ventana no sea mayor que la pantalla
}; };
// --- Opciones de vídeo --- // --- Opciones de vídeo ---
struct VideoOptions struct VideoOptions
{ {
SDL_ScaleMode scale_mode; // Filtro usado para el escalado de la imagen SDL_ScaleMode scale_mode; // Filtro usado para el escalado de la imagen
bool fullscreen; // Indica si se usa pantalla completa bool fullscreen; // Indica si se usa pantalla completa
bool v_sync; // Indica si se usa vsync bool v_sync; // Indica si se usa vsync
bool integer_scale; // Indica si se usa escalado entero bool integer_scale; // Indica si se usa escalado entero
bool shaders; // Indica si se usan shaders para los filtros de vídeo bool shaders; // Indica si se usan shaders para los filtros de vídeo
std::string info; // Información sobre el modo de vídeo std::string info; // Información sobre el modo de vídeo
}; };
// --- Opciones de música --- // --- Opciones de música ---
struct MusicOptions struct MusicOptions
{ {
bool enabled; // Indica si la música suena o no bool enabled; // Indica si la música suena o no
int volume; // Volumen de la música int volume; // Volumen de la música
}; };
// --- Opciones de sonido --- // --- Opciones de sonido ---
struct SoundOptions struct SoundOptions
{ {
bool enabled; // Indica si los sonidos suenan o no bool enabled; // Indica si los sonidos suenan o no
int volume; // Volumen de los sonidos int volume; // Volumen de los sonidos
}; };
// --- Opciones de audio --- // --- Opciones de audio ---
struct AudioOptions struct AudioOptions
{ {
MusicOptions music; // Opciones para la música MusicOptions music; // Opciones para la música
SoundOptions sound; // Opciones para los efectos de sonido SoundOptions sound; // Opciones para los efectos de sonido
bool enabled; // Indica si el audio está activo o no bool enabled; // Indica si el audio está activo o no
int volume; // Volumen general del audio int volume; // Volumen general del audio
}; };
// --- Opciones del juego --- // --- Opciones del juego ---
struct GameOptions struct GameOptions
{ {
GameDifficulty difficulty; // Dificultad del juego DifficultyCode difficulty; // Dificultad del juego
lang::Code language; // Idioma usado en el juego Lang::Code language; // Idioma usado en el juego
bool autofire; // Indicador de autofire bool autofire; // Indicador de autofire
bool shutdown_enabled; // Especifica si se puede apagar el sistema bool shutdown_enabled; // Especifica si se puede apagar el sistema
std::vector<HiScoreEntry> hi_score_table; // Tabla de mejores puntuaciones std::vector<HiScoreEntry> hi_score_table; // Tabla de mejores puntuaciones
@@ -78,11 +90,11 @@ struct GameOptions
last_hi_score_entry[0] = -1; last_hi_score_entry[0] = -1;
last_hi_score_entry[1] = -1; last_hi_score_entry[1] = -1;
} }
}; };
// --- Opciones de mando --- // --- Opciones de mando ---
struct GamepadOptions struct GamepadOptions
{ {
int index; // Índice en el vector de mandos int index; // Índice en el vector de mandos
int player_id; // Jugador asociado al mando int player_id; // Jugador asociado al mando
InputDeviceToUse type; // Indica si se usará teclado, mando o ambos InputDeviceToUse type; // Indica si se usará teclado, mando o ambos
@@ -96,36 +108,32 @@ struct GamepadOptions
: index(-1), player_id(-1), type(InputDeviceToUse::CONTROLLER), name(""), plugged(false), : index(-1), player_id(-1), type(InputDeviceToUse::CONTROLLER), name(""), plugged(false),
inputs{InputAction::FIRE_LEFT, InputAction::FIRE_CENTER, InputAction::FIRE_RIGHT, InputAction::START, InputAction::SERVICE}, inputs{InputAction::FIRE_LEFT, InputAction::FIRE_CENTER, InputAction::FIRE_RIGHT, InputAction::START, InputAction::SERVICE},
buttons{SDL_GAMEPAD_BUTTON_WEST, SDL_GAMEPAD_BUTTON_NORTH, SDL_GAMEPAD_BUTTON_EAST, SDL_GAMEPAD_BUTTON_START, SDL_GAMEPAD_BUTTON_BACK} {} buttons{SDL_GAMEPAD_BUTTON_WEST, SDL_GAMEPAD_BUTTON_NORTH, SDL_GAMEPAD_BUTTON_EAST, SDL_GAMEPAD_BUTTON_START, SDL_GAMEPAD_BUTTON_BACK} {}
}; };
// --- Opciones pendientes de aplicar --- // --- Opciones pendientes de aplicar ---
struct PendingChanges struct PendingChanges
{ {
lang::Code new_language; // Idioma en espera de aplicar Lang::Code new_language; // Idioma en espera de aplicar
GameDifficulty new_difficulty; // Dificultad en espera de aplicar DifficultyCode new_difficulty; // Dificultad en espera de aplicar
bool has_pending_changes = false; // Indica si hay cambios pendientes bool has_pending_changes = false; // Indica si hay cambios pendientes
}; };
// --- Opciones generales del programa --- // --- Variables globales ---
struct Options
{
WindowOptions window; // Opciones de la ventana WindowOptions window; // Opciones de la ventana
GameOptions game; // Opciones del juego GameOptions game; // Opciones del juego
VideoOptions video; // Opciones de vídeo VideoOptions video; // Opciones de vídeo
AudioOptions audio; // Opciones de audio AudioOptions audio; // Opciones de audio
std::vector<GamepadOptions> controllers; // Opciones de mando para cada jugador std::vector<GamepadOptions> controllers; // Opciones de mando para cada jugador
PendingChanges pending_changes; // Opciones que se aplican al cerrar PendingChanges pending_changes; // Opciones que se aplican al cerrar
};
// --- Variables globales --- // --- Funciones de configuración ---
extern Options options; void initOptions(); // Inicializa las opciones del programa
bool loadOptionsFile(std::string file_path); // Carga el fichero de configuración
// --- Funciones de configuración --- bool saveOptionsFile(std::string file_path); // Guarda el fichero de configuración
void initOptions(); // Inicializa las opciones del programa void setKeyboardToPlayer(int player_id); // Asigna el teclado al jugador
bool loadOptionsFile(std::string file_path); // Carga el fichero de configuración void swapOptionsKeyboard(); // Intercambia el teclado de jugador
bool saveOptionsFile(std::string file_path); // Guarda el fichero de configuración void swapOptionsControllers(); // Intercambia los jugadores asignados a los dos primeros mandos
void setKeyboardToPlayer(int player_id); // Asigna el teclado al jugador int getPlayerWhoUsesKeyboard(); // Averigua quién está usando el teclado
void swapOptionsKeyboard(); // Intercambia el teclado de jugador void applyPendingChanges(); // Aplica los cambios pendientes copiando los valores a sus variables
void swapOptionsControllers(); // Intercambia los jugadores asignados a los dos primeros mandos void checkPendingChanges();
int getPlayerWhoUsesKeyboard(); // Averigua quién está usando el teclado } // namespace Options
void applyPendingChanges(); // Aplica los cambios pendientes copiando los valores a sus variables

16
source/resource.cpp
View File

@@ -309,10 +309,10 @@ void Resource::createTextures()
{"game_text_1000_points", "1.000"}, {"game_text_1000_points", "1.000"},
{"game_text_2500_points", "2.500"}, {"game_text_2500_points", "2.500"},
{"game_text_5000_points", "5.000"}, {"game_text_5000_points", "5.000"},
{"game_text_powerup", lang::getText("[GAME_TEXT] 4")}, {"game_text_powerup", Lang::getText("[GAME_TEXT] 4")},
{"game_text_one_hit", lang::getText("[GAME_TEXT] 5")}, {"game_text_one_hit", Lang::getText("[GAME_TEXT] 5")},
{"game_text_stop", lang::getText("[GAME_TEXT] 6")}, {"game_text_stop", Lang::getText("[GAME_TEXT] 6")},
{"game_text_1000000_points", lang::getText("[GAME_TEXT] 8")}}; {"game_text_1000000_points", Lang::getText("[GAME_TEXT] 8")}};
auto text = getText("04b_25"); auto text = getText("04b_25");
for (const auto &s : strings) for (const auto &s : strings)
@@ -324,9 +324,9 @@ void Resource::createTextures()
// Texturas de tamaño doble // Texturas de tamaño doble
std::vector<NameAndText> strings2X = { std::vector<NameAndText> strings2X = {
{"game_text_100000_points", "100.000"}, {"game_text_100000_points", "100.000"},
{"game_text_get_ready", lang::getText("[GAME_TEXT] 7")}, {"game_text_get_ready", Lang::getText("[GAME_TEXT] 7")},
{"game_text_last_stage", lang::getText("[GAME_TEXT] 3")}, {"game_text_last_stage", Lang::getText("[GAME_TEXT] 3")},
{"game_text_congratulations", lang::getText("[GAME_TEXT] 1")}, {"game_text_congratulations", Lang::getText("[GAME_TEXT] 1")},
{"game_text_game_over", "Game Over"}}; {"game_text_game_over", "Game Over"}};
auto text2 = getText("04b_25_2x"); auto text2 = getText("04b_25_2x");
@@ -450,7 +450,7 @@ void Resource::renderProgress()
loading_text_->write( loading_text_->write(
loading_wired_rect_.x, loading_wired_rect_.x,
loading_wired_rect_.y - 9, loading_wired_rect_.y - 9,
lang::getText("[RESOURCE] LOADING") + " : " + loading_resource_name_ Lang::getText("[RESOURCE] LOADING") + " : " + loading_resource_name_
); );
// Renderiza el frame en pantalla // Renderiza el frame en pantalla

34
source/scoreboard.cpp
View File

@@ -170,7 +170,7 @@ void Scoreboard::fillPanelTextures()
text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i])); text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i]));
// MULT // MULT
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("[SCOREBOARD] 3")); text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 3"));
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, "x" + std::to_string(mult_[i]).substr(0, 3)); text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, "x" + std::to_string(mult_[i]).substr(0, 3));
break; break;
} }
@@ -178,13 +178,13 @@ void Scoreboard::fillPanelTextures()
case ScoreboardMode::DEMO: case ScoreboardMode::DEMO:
{ {
// DEMO MODE // DEMO MODE
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("[SCOREBOARD] 6")); text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 6"));
// PRESS START TO PLAY // PRESS START TO PLAY
if (time_counter_ % 10 < 8) if (time_counter_ % 10 < 8)
{ {
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("[SCOREBOARD] 8")); text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 8"));
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, lang::getText("[SCOREBOARD] 9")); text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, Lang::getText("[SCOREBOARD] 9"));
} }
break; break;
} }
@@ -192,13 +192,13 @@ void Scoreboard::fillPanelTextures()
case ScoreboardMode::WAITING: case ScoreboardMode::WAITING:
{ {
// GAME OVER // GAME OVER
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("[SCOREBOARD] 7")); text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 7"));
// PRESS START TO PLAY // PRESS START TO PLAY
if (time_counter_ % 10 < 8) if (time_counter_ % 10 < 8)
{ {
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("[SCOREBOARD] 8")); text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 8"));
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, lang::getText("[SCOREBOARD] 9")); text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, Lang::getText("[SCOREBOARD] 9"));
} }
break; break;
} }
@@ -206,13 +206,13 @@ void Scoreboard::fillPanelTextures()
case ScoreboardMode::GAME_OVER: case ScoreboardMode::GAME_OVER:
{ {
// GAME OVER // GAME OVER
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("[SCOREBOARD] 7")); text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 7"));
// PLEASE WAIT // PLEASE WAIT
if (time_counter_ % 10 < 8) if (time_counter_ % 10 < 8)
{ {
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("[SCOREBOARD] 12")); text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 12"));
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, lang::getText("[SCOREBOARD] 13")); text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, Lang::getText("[SCOREBOARD] 13"));
} }
break; break;
} }
@@ -220,7 +220,7 @@ void Scoreboard::fillPanelTextures()
case ScoreboardMode::STAGE_INFO: case ScoreboardMode::STAGE_INFO:
{ {
// STAGE // STAGE
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y, lang::getText("[SCOREBOARD] 5") + std::to_string(stage_)); text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y, Lang::getText("[SCOREBOARD] 5") + std::to_string(stage_));
// POWERMETER // POWERMETER
power_meter_sprite_->setSpriteClip(0, 0, 40, 7); power_meter_sprite_->setSpriteClip(0, 0, 40, 7);
@@ -229,7 +229,7 @@ void Scoreboard::fillPanelTextures()
power_meter_sprite_->render(); power_meter_sprite_->render();
// HI-SCORE // HI-SCORE
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("[SCOREBOARD] 4")); text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 4"));
const std::string name = hi_score_name_ == "" ? "" : hi_score_name_ + " - "; const std::string name = hi_score_name_ == "" ? "" : hi_score_name_ + " - ";
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, name + updateScoreText(hi_score_)); text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, name + updateScoreText(hi_score_));
break; break;
@@ -242,7 +242,7 @@ void Scoreboard::fillPanelTextures()
text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i])); text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i]));
// CONTINUE // CONTINUE
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("[SCOREBOARD] 10")); text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 10"));
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, std::to_string(continue_counter_[i])); text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, std::to_string(continue_counter_[i]));
break; break;
} }
@@ -255,7 +255,7 @@ void Scoreboard::fillPanelTextures()
// ENTER NAME // ENTER NAME
{ {
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("[SCOREBOARD] 11")); text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 11"));
SDL_FRect rect = {enter_name_pos_.x, enter_name_pos_.y, 5.0f, 7.0f}; SDL_FRect rect = {enter_name_pos_.x, enter_name_pos_.y, 5.0f, 7.0f};
// Recorre todos los slots de letras del nombre // Recorre todos los slots de letras del nombre
@@ -291,7 +291,7 @@ void Scoreboard::fillPanelTextures()
text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i])); text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i]));
// NAME // NAME
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("[SCOREBOARD] 11")); text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 11"));
/* TEXTO CENTRADO */ /* TEXTO CENTRADO */
// text_scoreboard_->writeDX(TEXT_CENTER | TEXT_COLOR, slot4_4_.x, slot4_4_.y, record_name_[i], 1, getColorLikeKnightRider(name_colors_, loop_counter_ / 5)); // text_scoreboard_->writeDX(TEXT_CENTER | TEXT_COLOR, slot4_4_.x, slot4_4_.y, record_name_[i], 1, getColorLikeKnightRider(name_colors_, loop_counter_ / 5));
@@ -302,12 +302,12 @@ void Scoreboard::fillPanelTextures()
case ScoreboardMode::GAME_COMPLETED: case ScoreboardMode::GAME_COMPLETED:
{ {
// GAME OVER // GAME OVER
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("[SCOREBOARD] 7")); text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 7"));
// SCORE // SCORE
if (time_counter_ % 10 < 8) if (time_counter_ % 10 < 8)
{ {
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("[SCOREBOARD] 14")); text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 14"));
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, updateScoreText(score_[i])); text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, updateScoreText(score_[i]));
} }
} }

2
source/section.cpp
View File

@@ -1,6 +1,6 @@
#include "section.h" #include "section.h"
namespace section namespace Section
{ {
Name name; Name name;
Options options; Options options;

2
source/section.h
View File

@@ -6,7 +6,7 @@
Proporciona variables globales para gestionar el flujo entre secciones. Proporciona variables globales para gestionar el flujo entre secciones.
*/ */
namespace section namespace Section
{ {
// --- Enumeraciones de secciones del programa --- // --- Enumeraciones de secciones del programa ---
enum class Name enum class Name

102
source/service_menu.cpp
View File

@@ -72,11 +72,11 @@ void ServiceMenu::render()
// TITULO // TITULO
y += title_padding_; y += title_padding_;
title_text_->writeDX(TEXT_COLOR | TEXT_CENTER, param.game.game_area.center_x, y, lang::getText("[SERVICE_MENU] TITLE"), -4, title_color_); title_text_->writeDX(TEXT_COLOR | TEXT_CENTER, param.game.game_area.center_x, y, title_, -4, title_color_);
// LINEA // LINEA
y = rect_.y + upper_height_; y = rect_.y + upper_height_;
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), title_color_.r, title_color_.g, title_color_.b, 255); SDL_SetRenderDrawColor(Screen::get()->getRenderer(), options.pending_changes.has_pending_changes ? 0 : title_color_.r, title_color_.g, title_color_.b, 255);
SDL_RenderLine(Screen::get()->getRenderer(), rect_.x + OPTIONS_HORIZONTAL_PADDING_, y, rect_.x + rect_.w - OPTIONS_HORIZONTAL_PADDING_, y); SDL_RenderLine(Screen::get()->getRenderer(), rect_.x + OPTIONS_HORIZONTAL_PADDING_, y, rect_.x + rect_.w - OPTIONS_HORIZONTAL_PADDING_, y);
// OPCIONES // OPCIONES
@@ -295,6 +295,7 @@ void ServiceMenu::selectOption()
{ {
previous_settings_group_ = current_settings_group_; previous_settings_group_ = current_settings_group_;
current_settings_group_ = display_options_.at(selected_)->target_group; current_settings_group_ = display_options_.at(selected_)->target_group;
title_ = settingsGroupToString(current_settings_group_);
updateMenu(current_settings_group_); updateMenu(current_settings_group_);
selected_ = 0; selected_ = 0;
setOptionsPosition(); setOptionsPosition();
@@ -305,22 +306,22 @@ void ServiceMenu::selectOption()
// Opción // Opción
if (display_options_.at(selected_)->behavior == OptionBehavior::SELECT) if (display_options_.at(selected_)->behavior == OptionBehavior::SELECT)
{ {
if (display_options_.at(selected_)->caption == lang::getText("[SERVICE_MENU] RESET")) if (display_options_.at(selected_)->caption == Lang::getText("[SERVICE_MENU] RESET"))
{ {
section::name = section::Name::RESET; Section::name = Section::Name::RESET;
toggle(); toggle();
return; return;
} }
else if (display_options_.at(selected_)->caption == lang::getText("[SERVICE_MENU] QUIT")) else if (display_options_.at(selected_)->caption == Lang::getText("[SERVICE_MENU] QUIT"))
{ {
section::name = section::Name::QUIT; Section::name = Section::Name::QUIT;
section::options = section::Options::NONE; Section::options = Section::Options::NONE;
return; return;
} }
else if (display_options_.at(selected_)->caption == lang::getText("[SERVICE_MENU] SHUTDOWN")) else if (display_options_.at(selected_)->caption == Lang::getText("[SERVICE_MENU] SHUTDOWN"))
{ {
section::name = section::Name::QUIT; Section::name = Section::Name::QUIT;
section::options = section::Options::SHUTDOWN; Section::options = Section::Options::SHUTDOWN;
return; return;
} }
return; return;
@@ -351,51 +352,51 @@ void ServiceMenu::initializeOptions()
options_.clear(); options_.clear();
// Video // Video
options_.emplace_back(lang::getText("[SERVICE_MENU] FULLSCREEN"), SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.fullscreen, ValueType::BOOL); options_.emplace_back(Lang::getText("[SERVICE_MENU] FULLSCREEN"), SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.fullscreen, ValueType::BOOL);
options_.emplace_back(lang::getText("[SERVICE_MENU] WINDOW_SIZE"), SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.window.size, ValueType::INT, 1, options.window.max_size, 1); options_.emplace_back(Lang::getText("[SERVICE_MENU] WINDOW_SIZE"), SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.window.size, ValueType::INT, 1, options.window.max_size, 1);
options_.emplace_back(lang::getText("[SERVICE_MENU] SHADERS"), SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.shaders, ValueType::BOOL); options_.emplace_back(Lang::getText("[SERVICE_MENU] SHADERS"), SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.shaders, ValueType::BOOL);
options_.emplace_back(lang::getText("[SERVICE_MENU] VSYNC"), SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.v_sync, ValueType::BOOL); options_.emplace_back(Lang::getText("[SERVICE_MENU] VSYNC"), SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.v_sync, ValueType::BOOL);
options_.emplace_back(lang::getText("[SERVICE_MENU] INTEGER_SCALE"), SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.integer_scale, ValueType::BOOL); options_.emplace_back(Lang::getText("[SERVICE_MENU] INTEGER_SCALE"), SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.integer_scale, ValueType::BOOL);
// Audio // Audio
options_.emplace_back(lang::getText("[SERVICE_MENU] AUDIO"), SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.enabled, ValueType::BOOL); options_.emplace_back(Lang::getText("[SERVICE_MENU] AUDIO"), SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.enabled, ValueType::BOOL);
options_.emplace_back(lang::getText("[SERVICE_MENU] MAIN_VOLUME"), SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.volume, ValueType::INT, 0, 100, 5); options_.emplace_back(Lang::getText("[SERVICE_MENU] MAIN_VOLUME"), SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.volume, ValueType::INT, 0, 100, 5);
options_.emplace_back(lang::getText("[SERVICE_MENU] MUSIC_VOLUME"), SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.music.volume, ValueType::INT, 0, 100, 5); options_.emplace_back(Lang::getText("[SERVICE_MENU] MUSIC_VOLUME"), SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.music.volume, ValueType::INT, 0, 100, 5);
options_.emplace_back(lang::getText("[SERVICE_MENU] SFX_VOLUME"), SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.sound.volume, ValueType::INT, 0, 100, 5); options_.emplace_back(Lang::getText("[SERVICE_MENU] SFX_VOLUME"), SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.sound.volume, ValueType::INT, 0, 100, 5);
// Settings // Settings
options_.emplace_back(lang::getText("[SERVICE_MENU] AUTOFIRE"), SettingsGroup::SETTINGS, OptionBehavior::ADJUST, &options.game.autofire, ValueType::BOOL); options_.emplace_back(Lang::getText("[SERVICE_MENU] AUTOFIRE"), SettingsGroup::SETTINGS, OptionBehavior::ADJUST, &options.game.autofire, ValueType::BOOL);
options_.emplace_back( options_.emplace_back(
lang::getText("[SERVICE_MENU] LANGUAGE"), Lang::getText("[SERVICE_MENU] LANGUAGE"),
SettingsGroup::SETTINGS, SettingsGroup::SETTINGS,
OptionBehavior::ADJUST, OptionBehavior::ADJUST,
&options.pending_changes.new_language, &options.pending_changes.new_language,
std::vector<std::string>{ std::vector<std::string>{
lang::getText("[SERVICE_MENU] LANG_ES"), Lang::getText("[SERVICE_MENU] LANG_ES"),
lang::getText("[SERVICE_MENU] LANG_BA"), Lang::getText("[SERVICE_MENU] LANG_BA"),
lang::getText("[SERVICE_MENU] LANG_EN")}); Lang::getText("[SERVICE_MENU] LANG_EN")});
options_.emplace_back( options_.emplace_back(
lang::getText("[SERVICE_MENU] DIFFICULTY"), Lang::getText("[SERVICE_MENU] DIFFICULTY"),
SettingsGroup::SETTINGS, SettingsGroup::SETTINGS,
OptionBehavior::ADJUST, OptionBehavior::ADJUST,
&options.pending_changes.new_difficulty, &options.pending_changes.new_difficulty,
std::vector<std::string>{ std::vector<std::string>{
lang::getText("[SERVICE_MENU] EASY"), Lang::getText("[SERVICE_MENU] EASY"),
lang::getText("[SERVICE_MENU] NORMAL"), Lang::getText("[SERVICE_MENU] NORMAL"),
lang::getText("[SERVICE_MENU] HARD")}); Lang::getText("[SERVICE_MENU] HARD")});
options_.emplace_back(lang::getText("[SERVICE_MENU] ENABLE_SHUTDOWN"), SettingsGroup::SETTINGS, OptionBehavior::ADJUST, &options.game.shutdown_enabled, ValueType::BOOL); options_.emplace_back(Lang::getText("[SERVICE_MENU] ENABLE_SHUTDOWN"), SettingsGroup::SETTINGS, OptionBehavior::ADJUST, &options.game.shutdown_enabled, ValueType::BOOL);
// System // System
options_.emplace_back(lang::getText("[SERVICE_MENU] RESET"), SettingsGroup::SYSTEM, OptionBehavior::SELECT, nullptr, ValueType::NONE); options_.emplace_back(Lang::getText("[SERVICE_MENU] RESET"), SettingsGroup::SYSTEM, OptionBehavior::SELECT, nullptr, ValueType::NONE);
options_.emplace_back(lang::getText("[SERVICE_MENU] QUIT"), SettingsGroup::SYSTEM, OptionBehavior::SELECT, nullptr, ValueType::NONE); options_.emplace_back(Lang::getText("[SERVICE_MENU] QUIT"), SettingsGroup::SYSTEM, OptionBehavior::SELECT, nullptr, ValueType::NONE);
if (options.game.shutdown_enabled) if (options.game.shutdown_enabled)
options_.emplace_back(lang::getText("[SERVICE_MENU] SHUTDOWN"), SettingsGroup::SYSTEM, OptionBehavior::SELECT, nullptr, ValueType::NONE); options_.emplace_back(Lang::getText("[SERVICE_MENU] SHUTDOWN"), SettingsGroup::SYSTEM, OptionBehavior::SELECT, nullptr, ValueType::NONE);
// Menu principal // Menu principal
options_.emplace_back(lang::getText("[SERVICE_MENU] VIDEO"), SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::VIDEO); options_.emplace_back(Lang::getText("[SERVICE_MENU] VIDEO"), SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::VIDEO);
options_.emplace_back(lang::getText("[SERVICE_MENU] AUDIO"), SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::AUDIO); options_.emplace_back(Lang::getText("[SERVICE_MENU] AUDIO"), SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::AUDIO);
options_.emplace_back(lang::getText("[SERVICE_MENU] SETTINGS"), SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::SETTINGS); options_.emplace_back(Lang::getText("[SERVICE_MENU] SETTINGS"), SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::SETTINGS);
options_.emplace_back(lang::getText("[SERVICE_MENU] SYSTEM"), SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::SYSTEM); options_.emplace_back(Lang::getText("[SERVICE_MENU] SYSTEM"), SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::SYSTEM);
// Al terminar de inicializar las opciones, recalcula los anchos de menú // Al terminar de inicializar las opciones, recalcula los anchos de menú
precalculateMenuWidths(); precalculateMenuWidths();
@@ -452,6 +453,7 @@ void ServiceMenu::applySettings(ServiceMenu::SettingsGroup group)
// Actualiza las opciones mostradas según el grupo seleccionado // Actualiza las opciones mostradas según el grupo seleccionado
void ServiceMenu::updateMenu(SettingsGroup group) void ServiceMenu::updateMenu(SettingsGroup group)
{ {
title_ = settingsGroupToString(group);
AdjustListValues(); AdjustListValues();
option_pairs_ = getOptionPairs(group); option_pairs_ = getOptionPairs(group);
display_options_ = getOptionsByGroup(group); display_options_ = getOptionsByGroup(group);
@@ -464,6 +466,7 @@ void ServiceMenu::reset()
{ {
selected_ = 0; selected_ = 0;
previous_settings_group_ = current_settings_group_ = SettingsGroup::MAIN; previous_settings_group_ = current_settings_group_ = SettingsGroup::MAIN;
title_ = settingsGroupToString(current_settings_group_);
initializeOptions(); initializeOptions();
updateMenu(current_settings_group_); updateMenu(current_settings_group_);
setAnchors(); setAnchors();
@@ -520,10 +523,10 @@ ServiceMenu::OptionEntry *ServiceMenu::getOptionEntryByCaption(const std::string
void ServiceMenu::AdjustListValues() void ServiceMenu::AdjustListValues()
{ {
// Idioma // Idioma
auto option = getOptionEntryByCaption(lang::getText("[SERVICE_MENU] LANGUAGE")); auto option = getOptionEntryByCaption(Lang::getText("[SERVICE_MENU] LANGUAGE"));
for (size_t i = 0; i < option->value_list.size(); ++i) for (size_t i = 0; i < option->value_list.size(); ++i)
{ {
if (lang::getCodeFromName(option->value_list[i]) == options.game.language) if (Lang::getCodeFromName(option->value_list[i]) == options.game.language)
{ {
option->list_index = i; option->list_index = i;
} }
@@ -553,8 +556,8 @@ void ServiceMenu::precalculateMenuWidths()
{ {
case ValueType::BOOL: case ValueType::BOOL:
max_value_width = std::max({max_value_width, max_value_width = std::max({max_value_width,
element_text_->lenght(lang::getText("[SERVICE_MENU] ON"), -2), element_text_->lenght(Lang::getText("[SERVICE_MENU] ON"), -2),
element_text_->lenght(lang::getText("[SERVICE_MENU] OFF"), -2)}); element_text_->lenght(Lang::getText("[SERVICE_MENU] OFF"), -2)});
break; break;
case ValueType::INT: case ValueType::INT:
max_value_width = std::max({max_value_width, max_value_width = std::max({max_value_width,
@@ -578,3 +581,22 @@ int ServiceMenu::getMenuWidthForGroup(SettingsGroup group) const
{ {
return group_menu_widths_[static_cast<int>(group)]; return group_menu_widths_[static_cast<int>(group)];
} }
std::string ServiceMenu::settingsGroupToString(SettingsGroup group) const
{
switch (group)
{
case SettingsGroup::MAIN:
return Lang::getText("[SERVICE_MENU] TITLE");
case SettingsGroup::VIDEO:
return Lang::getText("[SERVICE_MENU] VIDEO");
case SettingsGroup::AUDIO:
return Lang::getText("[SERVICE_MENU] AUDIO");
case SettingsGroup::SETTINGS:
return Lang::getText("[SERVICE_MENU] SETTINGS");
case SettingsGroup::SYSTEM:
return Lang::getText("[SERVICE_MENU] SYSTEM");
default:
return Lang::getText("[SERVICE_MENU] TITLE");
}
}

10
source/service_menu.h
View File

@@ -146,15 +146,15 @@ private:
// Idioma // Idioma
if (linked_variable == &options.pending_changes.new_language) if (linked_variable == &options.pending_changes.new_language)
{ {
options.pending_changes.new_language = lang::getCodeFromName(value_list[list_index]); options.pending_changes.new_language = Lang::getCodeFromName(value_list[list_index]);
options.pending_changes.has_pending_changes = true; checkPendingChanges();
} }
// Dificultad // Dificultad
if (linked_variable == &options.pending_changes.new_difficulty) if (linked_variable == &options.pending_changes.new_difficulty)
{ {
// options.pending_changes.new_difficulty = // options.pending_changes.new_difficulty =
options.pending_changes.has_pending_changes = true; checkPendingChanges();
} }
} }
} }
@@ -166,7 +166,7 @@ private:
switch (type) switch (type)
{ {
case ValueType::BOOL: case ValueType::BOOL:
return (*(static_cast<bool *>(linked_variable))) ? lang::getText("[SERVICE_MENU] ON") : lang::getText("[SERVICE_MENU] OFF"); return (*(static_cast<bool *>(linked_variable))) ? Lang::getText("[SERVICE_MENU] ON") : Lang::getText("[SERVICE_MENU] OFF");
case ValueType::INT: case ValueType::INT:
return std::to_string(*(static_cast<int *>(linked_variable))); return std::to_string(*(static_cast<int *>(linked_variable)));
case ValueType::LIST: case ValueType::LIST:
@@ -190,6 +190,7 @@ private:
SettingsGroup current_settings_group_; // Grupo de opciones actualmente activo SettingsGroup current_settings_group_; // Grupo de opciones actualmente activo
SettingsGroup previous_settings_group_; // Grupo de opciones anterior SettingsGroup previous_settings_group_; // Grupo de opciones anterior
Aspect aspect_ = Aspect::ASPECT1; // Estilo visual del menú Aspect aspect_ = Aspect::ASPECT1; // Estilo visual del menú
std::string title_; // Titulo a mostrar en el menu
// --- Variables de aspecto --- // --- Variables de aspecto ---
Color bg_color_ = SERV_MENU_BG_COLOR; // Color de fondo Color bg_color_ = SERV_MENU_BG_COLOR; // Color de fondo
@@ -239,6 +240,7 @@ private:
int findLargestGroupSize() const; // Devuelve el tamaño del grupo más grande int findLargestGroupSize() const; // Devuelve el tamaño del grupo más grande
GroupAlignment getGroupAlignment(SettingsGroup group) const; // Devuelve la alineación del grupo GroupAlignment getGroupAlignment(SettingsGroup group) const; // Devuelve la alineación del grupo
OptionEntry *getOptionEntryByCaption(const std::string &caption); // Devuelve un puntero a OptionEntry a partir del caption OptionEntry *getOptionEntryByCaption(const std::string &caption); // Devuelve un puntero a OptionEntry a partir del caption
std::string settingsGroupToString(SettingsGroup group) const;
// --- Métodos internos: Animación de resize --- // --- Métodos internos: Animación de resize ---
void updateResizeAnimation(); void updateResizeAnimation();

38
source/title.cpp
View File

@@ -46,10 +46,10 @@ Title::Title()
Resource::get()->getTexture("smb2.gif")->setPalette(1); Resource::get()->getTexture("smb2.gif")->setPalette(1);
// Asigna valores a otras variables // Asigna valores a otras variables
section::options = section::Options::TITLE_1; Section::options = Section::Options::TITLE_1;
const bool IS_TITLE_TO_DEMO = (section::attract_mode == section::AttractMode::TITLE_TO_DEMO); const bool IS_TITLE_TO_DEMO = (Section::attract_mode == Section::AttractMode::TITLE_TO_DEMO);
next_section_ = IS_TITLE_TO_DEMO ? section::Name::GAME_DEMO : section::Name::LOGO; next_section_ = IS_TITLE_TO_DEMO ? Section::Name::GAME_DEMO : Section::Name::LOGO;
section::attract_mode = IS_TITLE_TO_DEMO ? section::AttractMode::TITLE_TO_LOGO : section::AttractMode::TITLE_TO_DEMO; Section::attract_mode = IS_TITLE_TO_DEMO ? Section::AttractMode::TITLE_TO_LOGO : Section::AttractMode::TITLE_TO_DEMO;
} }
// Destructor // Destructor
@@ -112,7 +112,7 @@ void Title::render()
// 'PRESS TO PLAY' // 'PRESS TO PLAY'
if (counter_ % 50 > 14 && !define_buttons_->isEnabled()) if (counter_ % 50 > 14 && !define_buttons_->isEnabled())
{ {
text_->writeDX(TEXT_CENTER | TEXT_SHADOW, param.game.game_area.center_x, param.title.press_start_position, lang::getText("[TITLE] PRESS_BUTTON_TO_PLAY"), 1, NO_COLOR, 1, shadow); text_->writeDX(TEXT_CENTER | TEXT_SHADOW, param.game.game_area.center_x, param.title.press_start_position, Lang::getText("[TITLE] PRESS_BUTTON_TO_PLAY"), 1, NO_COLOR, 1, shadow);
} }
} }
@@ -121,7 +121,7 @@ void Title::render()
// 'PRESS TO PLAY' // 'PRESS TO PLAY'
if (counter_ % 10 > 4 && !define_buttons_->isEnabled()) if (counter_ % 10 > 4 && !define_buttons_->isEnabled())
{ {
text_->writeDX(TEXT_CENTER | TEXT_SHADOW, param.game.game_area.center_x, param.title.press_start_position, lang::getText("[TITLE] PRESS_BUTTON_TO_PLAY"), 1, NO_COLOR, 1, shadow); text_->writeDX(TEXT_CENTER | TEXT_SHADOW, param.game.game_area.center_x, param.title.press_start_position, Lang::getText("[TITLE] PRESS_BUTTON_TO_PLAY"), 1, NO_COLOR, 1, shadow);
} }
} }
@@ -181,7 +181,7 @@ void Title::checkEvents()
} }
} }
globalEvents::check(event); GlobalEvents::check(event);
define_buttons_->checkEvents(event); define_buttons_->checkEvents(event);
} }
} }
@@ -208,13 +208,13 @@ void Title::checkInput()
switch (CONTROLLER.player_id) switch (CONTROLLER.player_id)
{ {
case 1: case 1:
selection_ = section::Options::GAME_PLAY_1P; selection_ = Section::Options::GAME_PLAY_1P;
break; break;
case 2: case 2:
selection_ = section::Options::GAME_PLAY_2P; selection_ = Section::Options::GAME_PLAY_2P;
break; break;
default: default:
selection_ = section::Options::TITLE_TIME_OUT; selection_ = Section::Options::TITLE_TIME_OUT;
break; break;
} }
state_ = TitleState::START_HAS_BEEN_PRESSED; state_ = TitleState::START_HAS_BEEN_PRESSED;
@@ -243,13 +243,13 @@ void Title::checkInput()
} }
// Comprueba los inputs que se pueden introducir en cualquier sección del juego // Comprueba los inputs que se pueden introducir en cualquier sección del juego
globalInputs::check(); GlobalInputs::check();
} }
// Bucle para el titulo del juego // Bucle para el titulo del juego
void Title::run() void Title::run()
{ {
while (section::name == section::Name::TITLE) while (Section::name == Section::Name::TITLE)
{ {
checkInput(); checkInput();
update(); update();
@@ -277,7 +277,7 @@ void Title::swapControllers()
void Title::swapKeyboard() void Title::swapKeyboard()
{ {
swapOptionsKeyboard(); swapOptionsKeyboard();
std::string text = lang::getText("[DEFINE_BUTTONS] PLAYER") + std::to_string(getPlayerWhoUsesKeyboard()) + ": " + lang::getText("[DEFINE_BUTTONS] KEYBOARD"); std::string text = Lang::getText("[DEFINE_BUTTONS] PLAYER") + std::to_string(getPlayerWhoUsesKeyboard()) + ": " + Lang::getText("[DEFINE_BUTTONS] KEYBOARD");
Notifier::get()->show({text}); Notifier::get()->show({text});
} }
@@ -302,7 +302,7 @@ void Title::showControllers()
const size_t index = player_controller_index.at(i); const size_t index = player_controller_index.at(i);
if (options.controllers.at(index).plugged) if (options.controllers.at(index).plugged)
{ {
text.at(i) = lang::getText("[DEFINE_BUTTONS] PLAYER") + std::to_string(i + 1) + ": " + options.controllers.at(index).name; text.at(i) = Lang::getText("[DEFINE_BUTTONS] PLAYER") + std::to_string(i + 1) + ": " + options.controllers.at(index).name;
} }
} }
@@ -316,16 +316,16 @@ void Title::updateFade()
fade_->update(); fade_->update();
if (fade_->hasEnded()) if (fade_->hasEnded())
{ {
if (selection_ == section::Options::TITLE_TIME_OUT) if (selection_ == Section::Options::TITLE_TIME_OUT)
{ {
// El menu ha hecho time out // El menu ha hecho time out
section::name = next_section_; Section::name = next_section_;
} }
else else
{ {
// Se ha pulsado para jugar // Se ha pulsado para jugar
section::name = section::Name::GAME; Section::name = Section::Name::GAME;
section::options = selection_; Section::options = selection_;
Audio::get()->stopMusic(); Audio::get()->stopMusic();
} }
} }
@@ -363,7 +363,7 @@ void Title::updateState()
// El menu ha hecho time out // El menu ha hecho time out
fade_->setPostDuration(0); fade_->setPostDuration(0);
fade_->activate(); fade_->activate();
selection_ = section::Options::TITLE_TIME_OUT; selection_ = Section::Options::TITLE_TIME_OUT;
} }
break; break;

4
source/title.h
View File

@@ -54,8 +54,8 @@ private:
// --- Variables de estado --- // --- Variables de estado ---
int counter_ = 0; // Temporizador para la pantalla de título int counter_ = 0; // Temporizador para la pantalla de título
Uint64 ticks_ = 0; // Contador de ticks para ajustar la velocidad Uint64 ticks_ = 0; // Contador de ticks para ajustar la velocidad
section::Name next_section_; // Siguiente sección a cargar Section::Name next_section_; // Siguiente sección a cargar
section::Options selection_ = section::Options::TITLE_TIME_OUT; // Opción elegida en el título Section::Options selection_ = Section::Options::TITLE_TIME_OUT; // Opción elegida en el título
int num_controllers_; // Número de mandos conectados int num_controllers_; // Número de mandos conectados
TitleState state_; // Estado actual de la sección TitleState state_; // Estado actual de la sección

2
source/utils.cpp
View File

@@ -130,7 +130,7 @@ std::string boolToString(bool value)
// Convierte un valor booleano en una cadena "on" o "off" // Convierte un valor booleano en una cadena "on" o "off"
std::string boolToOnOff(bool value) std::string boolToOnOff(bool value)
{ {
return value ? lang::getText("[NOTIFICATIONS] 06") : lang::getText("[NOTIFICATIONS] 07"); return value ? Lang::getText("[NOTIFICATIONS] 06") : Lang::getText("[NOTIFICATIONS] 07");
} }
// Convierte una cadena a minusculas // Convierte una cadena a minusculas