jaildesigner-jailgames/jaildoctors_dilemma
1
0
Fork 2
Code Issues 1 Pull Requests Projects Releases 20 Wiki Activity

posat orden en defaults i defines

Browse Source
This commit is contained in:
Sergio
2025-11-21 09:30:33 +01:00
parent 0fb986d7c4
commit 6bf26f7470
18 changed files with 307 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
source/game/options.cpp
View File

@@ -208,7 +208,7 @@ auto stringToFilter(const std::string& str) -> Screen::Filter {
if (it != STRING_TO_FILTER.end()) {
return it->second;
}
return GameDefaults::VIDEO_FILTER;
return Defaults::Video::FILTER;
}
auto scancodeToString(SDL_Scancode scancode) -> std::string {
@@ -269,9 +269,9 @@ void loadWindowConfigFromYaml(const fkyaml::node& yaml) {
if (win.contains("zoom")) {
try {
int val = win["zoom"].get_value<int>();
window.zoom = (val > 0) ? val : GameDefaults::WINDOW_ZOOM;
window.zoom = (val > 0) ? val : Defaults::Window::ZOOM;
} catch (...) {
window.zoom = GameDefaults::WINDOW_ZOOM;
window.zoom = Defaults::Window::ZOOM;
}
}
}
@@ -283,25 +283,25 @@ void loadBorderConfigFromYaml(const fkyaml::node& border) {
try {
video.border.enabled = border["enabled"].get_value<bool>();
} catch (...) {
video.border.enabled = GameDefaults::BORDER_ENABLED;
video.border.enabled = Defaults::Border::ENABLED;
}
}
if (border.contains("width")) {
try {
auto val = border["width"].get_value<float>();
video.border.width = (val > 0) ? val : GameDefaults::BORDER_WIDTH;
video.border.width = (val > 0) ? val : Defaults::Border::WIDTH;
} catch (...) {
video.border.width = GameDefaults::BORDER_WIDTH;
video.border.width = Defaults::Border::WIDTH;
}
}
if (border.contains("height")) {
try {
auto val = border["height"].get_value<float>();
video.border.height = (val > 0) ? val : GameDefaults::BORDER_HEIGHT;
video.border.height = (val > 0) ? val : Defaults::Border::HEIGHT;
} catch (...) {
video.border.height = GameDefaults::BORDER_HEIGHT;
video.border.height = Defaults::Border::HEIGHT;
}
}
}
@@ -313,7 +313,7 @@ void loadBasicVideoFieldsFromYaml(const fkyaml::node& vid) {
try {
video.fullscreen = vid["fullscreen"].get_value<bool>();
} catch (...) {
video.fullscreen = GameDefaults::VIDEO_FULLSCREEN;
video.fullscreen = Defaults::Video::FULLSCREEN;
}
}
@@ -323,7 +323,7 @@ void loadBasicVideoFieldsFromYaml(const fkyaml::node& vid) {
auto filter_str = vid["filter"].get_value<std::string>();
video.filter = stringToFilter(filter_str);
} catch (...) {
video.filter = GameDefaults::VIDEO_FILTER;
video.filter = Defaults::Video::FILTER;
}
}
@@ -331,7 +331,7 @@ void loadBasicVideoFieldsFromYaml(const fkyaml::node& vid) {
try {
video.shaders = vid["shaders"].get_value<bool>();
} catch (...) {
video.shaders = GameDefaults::VIDEO_SHADERS;
video.shaders = Defaults::Video::SHADERS;
}
}
@@ -339,7 +339,7 @@ void loadBasicVideoFieldsFromYaml(const fkyaml::node& vid) {
try {
video.vertical_sync = vid["vertical_sync"].get_value<bool>();
} catch (...) {
video.vertical_sync = GameDefaults::VIDEO_VERTICAL_SYNC;
video.vertical_sync = Defaults::Video::VERTICAL_SYNC;
}
}
@@ -347,7 +347,7 @@ void loadBasicVideoFieldsFromYaml(const fkyaml::node& vid) {
try {
video.integer_scale = vid["integer_scale"].get_value<bool>();
} catch (...) {
video.integer_scale = GameDefaults::VIDEO_INTEGER_SCALE;
video.integer_scale = Defaults::Video::INTEGER_SCALE;
}
}
@@ -355,7 +355,7 @@ void loadBasicVideoFieldsFromYaml(const fkyaml::node& vid) {
try {
video.keep_aspect = vid["keep_aspect"].get_value<bool>();
} catch (...) {
video.keep_aspect = GameDefaults::VIDEO_KEEP_ASPECT;
video.keep_aspect = Defaults::Video::KEEP_ASPECT;
}
}
@@ -365,10 +365,10 @@ void loadBasicVideoFieldsFromYaml(const fkyaml::node& vid) {
if (isValidPalette(palette_str)) {
video.palette = palette_str;
} else {
video.palette = GameDefaults::PALETTE_NAME;
video.palette = Defaults::Video::PALETTE_NAME;
}
} catch (...) {
video.palette = GameDefaults::PALETTE_NAME;
video.palette = Defaults::Video::PALETTE_NAME;
}
}
}
@@ -394,27 +394,27 @@ void loadKeyboardControlsFromYaml(const fkyaml::node& yaml) {
if (ctrl.contains("key_left")) {
try {
auto key_str = ctrl["key_left"].get_value<std::string>();
keyboard_controls.key_left = stringToScancode(key_str, GameDefaults::CONTROL_KEY_LEFT);
keyboard_controls.key_left = stringToScancode(key_str, Defaults::Controls::KEY_LEFT);
} catch (...) {
keyboard_controls.key_left = GameDefaults::CONTROL_KEY_LEFT;
keyboard_controls.key_left = Defaults::Controls::KEY_LEFT;
}
}
if (ctrl.contains("key_right")) {
try {
auto key_str = ctrl["key_right"].get_value<std::string>();
keyboard_controls.key_right = stringToScancode(key_str, GameDefaults::CONTROL_KEY_RIGHT);
keyboard_controls.key_right = stringToScancode(key_str, Defaults::Controls::KEY_RIGHT);
} catch (...) {
keyboard_controls.key_right = GameDefaults::CONTROL_KEY_RIGHT;
keyboard_controls.key_right = Defaults::Controls::KEY_RIGHT;
}
}
if (ctrl.contains("key_jump")) {
try {
auto key_str = ctrl["key_jump"].get_value<std::string>();
keyboard_controls.key_jump = stringToScancode(key_str, GameDefaults::CONTROL_KEY_JUMP);
keyboard_controls.key_jump = stringToScancode(key_str, Defaults::Controls::KEY_JUMP);
} catch (...) {
keyboard_controls.key_jump = GameDefaults::CONTROL_KEY_JUMP;
keyboard_controls.key_jump = Defaults::Controls::KEY_JUMP;
}
}
}
@@ -428,27 +428,27 @@ void loadGamepadControlsFromYaml(const fkyaml::node& yaml) {
if (gp.contains("button_left")) {
try {
auto button_str = gp["button_left"].get_value<std::string>();
gamepad_controls.button_left = stringToGamepadButton(button_str, GameDefaults::GAMEPAD_BUTTON_LEFT);
gamepad_controls.button_left = stringToGamepadButton(button_str, Defaults::Controls::GAMEPAD_BUTTON_LEFT);
} catch (...) {
gamepad_controls.button_left = GameDefaults::GAMEPAD_BUTTON_LEFT;
gamepad_controls.button_left = Defaults::Controls::GAMEPAD_BUTTON_LEFT;
}
}
if (gp.contains("button_right")) {
try {
auto button_str = gp["button_right"].get_value<std::string>();
gamepad_controls.button_right = stringToGamepadButton(button_str, GameDefaults::GAMEPAD_BUTTON_RIGHT);
gamepad_controls.button_right = stringToGamepadButton(button_str, Defaults::Controls::GAMEPAD_BUTTON_RIGHT);
} catch (...) {
gamepad_controls.button_right = GameDefaults::GAMEPAD_BUTTON_RIGHT;
gamepad_controls.button_right = Defaults::Controls::GAMEPAD_BUTTON_RIGHT;
}
}
if (gp.contains("button_jump")) {
try {
auto button_str = gp["button_jump"].get_value<std::string>();
gamepad_controls.button_jump = stringToGamepadButton(button_str, GameDefaults::GAMEPAD_BUTTON_JUMP);
gamepad_controls.button_jump = stringToGamepadButton(button_str, Defaults::Controls::GAMEPAD_BUTTON_JUMP);
} catch (...) {
gamepad_controls.button_jump = GameDefaults::GAMEPAD_BUTTON_JUMP;
gamepad_controls.button_jump = Defaults::Controls::GAMEPAD_BUTTON_JUMP;
}
}
}
@@ -471,7 +471,7 @@ void setConfigFile(const std::string& path) {
// Carga las opciones desde el fichero configurado
auto loadFromFile() -> bool {
// Versión esperada del fichero
const std::string CONFIG_VERSION = GameDefaults::VERSION;
const std::string CONFIG_VERSION = Texts::VERSION;
version = "";
// Intenta abrir y leer el fichero
@@ -558,7 +558,7 @@ auto saveToFile() -> bool {
// VERSION
file << "# VERSION \n";
file << "version: \"" << GameDefaults::VERSION << "\"\n";
file << "version: \"" << Texts::VERSION << "\"\n";
file << "\n";
// WINDOW