Options: renombrats els metodes
This commit is contained in:
@@ -12,7 +12,7 @@ namespace Options
|
||||
{
|
||||
// --- Variables globales ---
|
||||
WindowOptions window; // Opciones de la ventana
|
||||
GameOptions game; // Opciones del juego
|
||||
SettingsOptions settings; // Opciones del juego
|
||||
VideoOptions video; // Opciones de vídeo
|
||||
AudioOptions audio; // Opciones de audio
|
||||
std::vector<GamepadOptions> controllers; // Opciones de mando para cada jugador
|
||||
@@ -28,7 +28,7 @@ namespace Options
|
||||
bool setOptions(const std::string &var, const std::string &value);
|
||||
|
||||
// Inicializa las opciones del programa
|
||||
void initOptions()
|
||||
void init()
|
||||
{
|
||||
window.caption = "Coffee Crisis Arcade Edition";
|
||||
window.size = 2;
|
||||
@@ -49,11 +49,11 @@ namespace Options
|
||||
audio.sound.volume = 50;
|
||||
|
||||
// Opciones de juego
|
||||
game.difficulty = DifficultyCode::NORMAL;
|
||||
game.language = Lang::Code::VALENCIAN;
|
||||
game.autofire = true;
|
||||
game.shutdown_enabled = false;
|
||||
game.clearLastHiScoreEntries();
|
||||
settings.difficulty = DifficultyCode::NORMAL;
|
||||
settings.language = Lang::Code::VALENCIAN;
|
||||
settings.autofire = true;
|
||||
settings.shutdown_enabled = false;
|
||||
settings.clearLastHiScoreEntries();
|
||||
|
||||
// Opciones de control
|
||||
controllers.clear();
|
||||
@@ -63,16 +63,16 @@ namespace Options
|
||||
setKeyboardToPlayer(1);
|
||||
|
||||
// Opciones pendientes
|
||||
pending_changes.new_language = game.language;
|
||||
pending_changes.new_difficulty = game.difficulty;
|
||||
pending_changes.new_language = settings.language;
|
||||
pending_changes.new_difficulty = settings.difficulty;
|
||||
pending_changes.has_pending_changes = false;
|
||||
}
|
||||
|
||||
// Carga el fichero de configuración
|
||||
bool loadOptionsFile(std::string file_path)
|
||||
bool loadFromFile(std::string file_path)
|
||||
{
|
||||
// Inicializa las opciones del programa
|
||||
initOptions();
|
||||
init();
|
||||
|
||||
// Indicador de éxito en la carga
|
||||
bool success = true;
|
||||
@@ -107,22 +107,22 @@ namespace Options
|
||||
else
|
||||
{
|
||||
// Crea el fichero con los valores por defecto
|
||||
saveOptionsFile(file_path);
|
||||
saveToFile(file_path);
|
||||
}
|
||||
|
||||
// Normaliza los valores
|
||||
if (game.language != Lang::Code::ENGLISH &&
|
||||
game.language != Lang::Code::VALENCIAN &&
|
||||
game.language != Lang::Code::SPANISH)
|
||||
if (settings.language != Lang::Code::ENGLISH &&
|
||||
settings.language != Lang::Code::VALENCIAN &&
|
||||
settings.language != Lang::Code::SPANISH)
|
||||
{
|
||||
game.language = Lang::Code::ENGLISH;
|
||||
settings.language = Lang::Code::ENGLISH;
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
// Guarda el fichero de configuración
|
||||
bool saveOptionsFile(std::string file_path)
|
||||
bool saveToFile(std::string file_path)
|
||||
{
|
||||
std::ofstream file(file_path);
|
||||
|
||||
@@ -166,10 +166,10 @@ namespace Options
|
||||
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 << "game.language=" << static_cast<int>(game.language) << "\n";
|
||||
file << "game.difficulty=" << static_cast<int>(game.difficulty) << "\n";
|
||||
file << "game.autofire=" << boolToString(game.autofire) << "\n";
|
||||
file << "game.shutdown_enabled=" << boolToString(game.shutdown_enabled) << "\n";
|
||||
file << "game.language=" << static_cast<int>(settings.language) << "\n";
|
||||
file << "game.difficulty=" << static_cast<int>(settings.difficulty) << "\n";
|
||||
file << "game.autofire=" << boolToString(settings.autofire) << "\n";
|
||||
file << "game.shutdown_enabled=" << boolToString(settings.shutdown_enabled) << "\n";
|
||||
|
||||
// Opciones de mandos
|
||||
file << "\n\n## CONTROLLERS\n";
|
||||
@@ -258,21 +258,21 @@ namespace Options
|
||||
// Opciones de juego
|
||||
else if (var == "game.language")
|
||||
{
|
||||
game.language = static_cast<Lang::Code>(std::stoi(value));
|
||||
pending_changes.new_language = game.language;
|
||||
settings.language = static_cast<Lang::Code>(std::stoi(value));
|
||||
pending_changes.new_language = settings.language;
|
||||
}
|
||||
else if (var == "game.difficulty")
|
||||
{
|
||||
game.difficulty = static_cast<DifficultyCode>(std::stoi(value));
|
||||
pending_changes.new_difficulty = game.difficulty;
|
||||
settings.difficulty = static_cast<DifficultyCode>(std::stoi(value));
|
||||
pending_changes.new_difficulty = settings.difficulty;
|
||||
}
|
||||
else if (var == "game.autofire")
|
||||
{
|
||||
game.autofire = stringToBool(value);
|
||||
settings.autofire = stringToBool(value);
|
||||
}
|
||||
else if (var == "game.shutdown_enabled")
|
||||
{
|
||||
game.shutdown_enabled = stringToBool(value);
|
||||
settings.shutdown_enabled = stringToBool(value);
|
||||
}
|
||||
|
||||
// Opciones de mandos
|
||||
@@ -370,13 +370,13 @@ namespace Options
|
||||
}
|
||||
|
||||
// Intercambia el teclado de jugador
|
||||
void swapOptionsKeyboard()
|
||||
void swapKeyboard()
|
||||
{
|
||||
std::swap(controllers.at(0).type, controllers.at(1).type);
|
||||
}
|
||||
|
||||
// Intercambia los jugadores asignados a los dos primeros mandos
|
||||
void swapOptionsControllers()
|
||||
void swapControllers()
|
||||
{
|
||||
std::swap(controllers.at(0).player_id, controllers.at(1).player_id);
|
||||
std::swap(controllers.at(0).type, controllers.at(1).type);
|
||||
@@ -400,16 +400,16 @@ namespace Options
|
||||
{
|
||||
if (pending_changes.has_pending_changes)
|
||||
{
|
||||
game.language = pending_changes.new_language;
|
||||
game.difficulty = pending_changes.new_difficulty;
|
||||
settings.language = pending_changes.new_language;
|
||||
settings.difficulty = pending_changes.new_difficulty;
|
||||
pending_changes.has_pending_changes = false;
|
||||
}
|
||||
}
|
||||
|
||||
void checkPendingChanges()
|
||||
{
|
||||
if (game.language != pending_changes.new_language ||
|
||||
game.difficulty != pending_changes.new_difficulty)
|
||||
if (settings.language != pending_changes.new_language ||
|
||||
settings.difficulty != pending_changes.new_difficulty)
|
||||
{
|
||||
pending_changes.has_pending_changes = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user