difficulty: mogut desde options a un fitxer propi

2025-07-23 19:52:57 +02:00
parent e21839e478
commit d33c1f5dc5
10 changed files with 319 additions and 146 deletions
--- a/source/ui/service_menu.cpp
+++ b/source/ui/service_menu.cpp
@@ -3,6 +3,7 @@
 #include <algorithm>  // Para max

 #include "audio.h"          // Para Audio
+#include "difficulty.h" // Para Difficulty
 #include "lang.h"           // Para getText, getCodeFromName, getNameFromCode
 #include "menu_option.h"    // Para MenuOption, BoolOption, ActionOption, IntOption, FolderOption, ListOption
 #include "menu_renderer.h"  // Para MenuRenderer
@@ -238,36 +239,154 @@ auto ServiceMenu::countOptionsInGroup(SettingsGroup group) const -> size_t {
 void ServiceMenu::initializeOptions() {
    options_.clear();

-    // --- Video ---
-    options_.push_back(std::make_unique<BoolOption>(Lang::getText("[SERVICE_MENU] FULLSCREEN"), SettingsGroup::VIDEO, &Options::video.fullscreen));
-    options_.push_back(std::make_unique<IntOption>(Lang::getText("[SERVICE_MENU] WINDOW_SIZE"), SettingsGroup::VIDEO, &Options::window.zoom, 1, Options::window.max_zoom, 1));
-    options_.push_back(std::make_unique<BoolOption>(Lang::getText("[SERVICE_MENU] SHADERS"), SettingsGroup::VIDEO, &Options::video.shaders));
-    options_.push_back(std::make_unique<BoolOption>(Lang::getText("[SERVICE_MENU] VSYNC"), SettingsGroup::VIDEO, &Options::video.vsync));
-    options_.push_back(std::make_unique<BoolOption>(Lang::getText("[SERVICE_MENU] INTEGER_SCALE"), SettingsGroup::VIDEO, &Options::video.integer_scale));
+    // VIDEO
+    options_.push_back(std::make_unique<BoolOption>(
+        Lang::getText("[SERVICE_MENU] FULLSCREEN"),
+        SettingsGroup::VIDEO,
+        &Options::video.fullscreen));

-    // --- Audio ---
-    options_.push_back(std::make_unique<BoolOption>(Lang::getText("[SERVICE_MENU] AUDIO"), SettingsGroup::AUDIO, &Options::audio.enabled));
-    options_.push_back(std::make_unique<IntOption>(Lang::getText("[SERVICE_MENU] MAIN_VOLUME"), SettingsGroup::AUDIO, &Options::audio.volume, 0, 100, 5));
-    options_.push_back(std::make_unique<IntOption>(Lang::getText("[SERVICE_MENU] MUSIC_VOLUME"), SettingsGroup::AUDIO, &Options::audio.music.volume, 0, 100, 5));
-    options_.push_back(std::make_unique<IntOption>(Lang::getText("[SERVICE_MENU] SFX_VOLUME"), SettingsGroup::AUDIO, &Options::audio.sound.volume, 0, 100, 5));
+    options_.push_back(std::make_unique<IntOption>(
+        Lang::getText("[SERVICE_MENU] WINDOW_SIZE"),
+        SettingsGroup::VIDEO,
+        &Options::window.zoom,
+        1,
+        Options::window.max_zoom,
+        1));

-    // --- Settings ---
-    options_.push_back(std::make_unique<BoolOption>(Lang::getText("[SERVICE_MENU] AUTOFIRE"), SettingsGroup::SETTINGS, &Options::settings.autofire));
-    options_.push_back(std::make_unique<ListOption>(Lang::getText("[SERVICE_MENU] LANGUAGE"), SettingsGroup::SETTINGS, std::vector<std::string>{Lang::getText("[SERVICE_MENU] LANG_ES"), Lang::getText("[SERVICE_MENU] LANG_BA"), Lang::getText("[SERVICE_MENU] LANG_EN")}, []() { return Lang::getNameFromCode(Options::pending_changes.new_language); }, [](const std::string &val) { Options::pending_changes.new_language = Lang::getCodeFromName(val); Options::checkPendingChanges(); }));
-    options_.push_back(std::make_unique<ListOption>(Lang::getText("[SERVICE_MENU] DIFFICULTY"), SettingsGroup::SETTINGS, std::vector<std::string>{Lang::getText("[SERVICE_MENU] EASY"), Lang::getText("[SERVICE_MENU] NORMAL"), Lang::getText("[SERVICE_MENU] HARD")}, []() { return Options::getDifficultyNameFromCode(Options::pending_changes.new_difficulty); }, [](const std::string &val) { Options::pending_changes.new_difficulty = Options::getDifficultyCodeFromName(val); Options::checkPendingChanges(); }));
-    options_.push_back(std::make_unique<BoolOption>(Lang::getText("[SERVICE_MENU] ENABLE_SHUTDOWN"), SettingsGroup::SETTINGS, &Options::settings.shutdown_enabled));
+    options_.push_back(std::make_unique<BoolOption>(
+        Lang::getText("[SERVICE_MENU] SHADERS"),
+        SettingsGroup::VIDEO,
+        &Options::video.shaders));

-    // --- System ---
-    options_.push_back(std::make_unique<ActionOption>(Lang::getText("[SERVICE_MENU] RESET"), SettingsGroup::SYSTEM, [this]() { Section::name = Section::Name::RESET; toggle(); }));
-    options_.push_back(std::make_unique<ActionOption>(Lang::getText("[SERVICE_MENU] QUIT"), SettingsGroup::SYSTEM, []() { Section::name = Section::Name::QUIT; Section::options = Section::Options::NONE; }));
-    options_.push_back(std::make_unique<ActionOption>(Lang::getText("[SERVICE_MENU] SHUTDOWN"), SettingsGroup::SYSTEM, []() { Section::name = Section::Name::QUIT; Section::options = Section::Options::SHUTDOWN; }, !Options::settings.shutdown_enabled));
+    options_.push_back(std::make_unique<BoolOption>(
+        Lang::getText("[SERVICE_MENU] VSYNC"),
+        SettingsGroup::VIDEO,
+        &Options::video.vsync));

-    // --- Main Menu ---
-    options_.push_back(std::make_unique<FolderOption>(Lang::getText("[SERVICE_MENU] VIDEO"), SettingsGroup::MAIN, SettingsGroup::VIDEO));
-    options_.push_back(std::make_unique<FolderOption>(Lang::getText("[SERVICE_MENU] AUDIO"), SettingsGroup::MAIN, SettingsGroup::AUDIO));
-    options_.push_back(std::make_unique<FolderOption>(Lang::getText("[SERVICE_MENU] SETTINGS"), SettingsGroup::MAIN, SettingsGroup::SETTINGS));
-    options_.push_back(std::make_unique<FolderOption>(Lang::getText("[SERVICE_MENU] SYSTEM"), SettingsGroup::MAIN, SettingsGroup::SYSTEM));
+    options_.push_back(std::make_unique<BoolOption>(
+        Lang::getText("[SERVICE_MENU] INTEGER_SCALE"),
+        SettingsGroup::VIDEO,
+        &Options::video.integer_scale));

+    // AUDIO
+    options_.push_back(std::make_unique<BoolOption>(
+        Lang::getText("[SERVICE_MENU] AUDIO"),
+        SettingsGroup::AUDIO,
+        &Options::audio.enabled));
+
+    options_.push_back(std::make_unique<IntOption>(
+        Lang::getText("[SERVICE_MENU] MAIN_VOLUME"),
+        SettingsGroup::AUDIO,
+        &Options::audio.volume,
+        0,
+        100,
+        5));
+
+    options_.push_back(std::make_unique<IntOption>(
+        Lang::getText("[SERVICE_MENU] MUSIC_VOLUME"),
+        SettingsGroup::AUDIO,
+        &Options::audio.music.volume,
+        0,
+        100,
+        5));
+
+    options_.push_back(std::make_unique<IntOption>(
+        Lang::getText("[SERVICE_MENU] SFX_VOLUME"),
+        SettingsGroup::AUDIO,
+        &Options::audio.sound.volume,
+        0,
+        100,
+        5));
+
+    // SETTINGS
+    options_.push_back(std::make_unique<BoolOption>(
+        Lang::getText("[SERVICE_MENU] AUTOFIRE"),
+        SettingsGroup::SETTINGS,
+        &Options::settings.autofire));
+
+    options_.push_back(std::make_unique<ListOption>(
+        Lang::getText("[SERVICE_MENU] LANGUAGE"),
+        SettingsGroup::SETTINGS,
+        std::vector<std::string>{
+            Lang::getText("[SERVICE_MENU] LANG_ES"),
+            Lang::getText("[SERVICE_MENU] LANG_BA"),
+            Lang::getText("[SERVICE_MENU] LANG_EN")},
+        []() {
+            return Lang::getNameFromCode(Options::pending_changes.new_language);
+        },
+        [](const std::string &val) {
+            Options::pending_changes.new_language = Lang::getCodeFromName(val);
+            Options::checkPendingChanges();
+        }));
+
+    options_.push_back(std::make_unique<ListOption>(
+        Lang::getText("[SERVICE_MENU] DIFFICULTY"),
+        SettingsGroup::SETTINGS,
+        std::vector<std::string>{
+            Lang::getText("[SERVICE_MENU] EASY"),
+            Lang::getText("[SERVICE_MENU] NORMAL"),
+            Lang::getText("[SERVICE_MENU] HARD")},
+        []() {
+            return Difficulty::getNameFromCode(Options::pending_changes.new_difficulty);
+        },
+        [](const std::string &val) {
+            Options::pending_changes.new_difficulty = Difficulty::getCodeFromName(val);
+            Options::checkPendingChanges();
+        }));
+
+    options_.push_back(std::make_unique<BoolOption>(
+        Lang::getText("[SERVICE_MENU] ENABLE_SHUTDOWN"),
+        SettingsGroup::SETTINGS,
+        &Options::settings.shutdown_enabled));
+
+    // SYSTEM
+    options_.push_back(std::make_unique<ActionOption>(
+        Lang::getText("[SERVICE_MENU] RESET"),
+        SettingsGroup::SYSTEM,
+        [this]() {
+            Section::name = Section::Name::RESET;
+            toggle();
+        }));
+
+    options_.push_back(std::make_unique<ActionOption>(
+        Lang::getText("[SERVICE_MENU] QUIT"),
+        SettingsGroup::SYSTEM,
+        []() {
+            Section::name = Section::Name::QUIT;
+            Section::options = Section::Options::NONE;
+        }));
+
+    options_.push_back(std::make_unique<ActionOption>(
+        Lang::getText("[SERVICE_MENU] SHUTDOWN"),
+        SettingsGroup::SYSTEM,
+        []() {
+            Section::name = Section::Name::QUIT;
+            Section::options = Section::Options::SHUTDOWN;
+        },
+        !Options::settings.shutdown_enabled));
+
+    // MAIN MENU
+    options_.push_back(std::make_unique<FolderOption>(
+        Lang::getText("[SERVICE_MENU] VIDEO"),
+        SettingsGroup::MAIN,
+        SettingsGroup::VIDEO));
+
+    options_.push_back(std::make_unique<FolderOption>(
+        Lang::getText("[SERVICE_MENU] AUDIO"),
+        SettingsGroup::MAIN,
+        SettingsGroup::AUDIO));
+
+    options_.push_back(std::make_unique<FolderOption>(
+        Lang::getText("[SERVICE_MENU] SETTINGS"),
+        SettingsGroup::MAIN,
+        SettingsGroup::SETTINGS));
+
+    options_.push_back(std::make_unique<FolderOption>(
+        Lang::getText("[SERVICE_MENU] SYSTEM"),
+        SettingsGroup::MAIN,
+        SettingsGroup::SYSTEM));
+
+    // Oculta opciones según configuración
    setHiddenOptions();
 }