Port Cvar_Prefix.h and ConfigUpdater from SoH

CMake/2ship-cvars.cmake

@@ -1,5 +1,4 @@
-set(CVAR_PREFIX_RANDOMIZER_ENHANCEMENT "gRandoEnhancements")
-set(CVAR_PREFIX_RANDOMIZER_SETTING "gRandoSettings")
+set(CVAR_PREFIX_RANDOMIZER "gRando")
 set(CVAR_PREFIX_COSMETIC "gCosmetics")
 set(CVAR_PREFIX_AUDIO "gAudioEditor")
 set(CVAR_PREFIX_CHEAT "gCheats")
@@ -10,9 +9,10 @@ set(CVAR_PREFIX_TRACKER "gTrackers")
 set(CVAR_PREFIX_DEVELOPER_TOOLS "gDeveloperTools")
 set(CVAR_PREFIX_GENERAL "gGeneral")
 set(CVAR_PREFIX_REMOTE "gRemote")
+set(CVAR_PREFIX_GAMEPLAY_STATS "gGameplayStats")
+set(CVAR_PREFIX_TIME_DISPLAY "gTimeDisplay")
 add_compile_definitions(
-	CVAR_PREFIX_RANDOMIZER_ENHANCEMENT="${CVAR_PREFIX_RANDOMIZER_ENHANCEMENT}"
-	CVAR_PREFIX_RANDOMIZER_SETTING="${CVAR_PREFIX_RANDOMIZER_SETTING}"
+	CVAR_PREFIX_RANDOMIZER="${CVAR_PREFIX_RANDOMIZER}"
 	CVAR_PREFIX_COSMETIC="${CVAR_PREFIX_COSMETIC}"
 	CVAR_PREFIX_AUDIO="${CVAR_PREFIX_AUDIO}"
 	CVAR_PREFIX_CHEAT="${CVAR_PREFIX_CHEAT}"
@@ -23,4 +23,6 @@ add_compile_definitions(
 	CVAR_PREFIX_DEVELOPER_TOOLS="${CVAR_PREFIX_DEVELOPER_TOOLS}"
 	CVAR_PREFIX_GENERAL="${CVAR_PREFIX_GENERAL}"
 	CVAR_PREFIX_REMOTE="${CVAR_PREFIX_REMOTE}"
+	CVAR_PREFIX_GAMEPLAY_STATS="${CVAR_PREFIX_GAMEPLAY_STATS}"
+	CVAR_PREFIX_TIME_DISPLAY="${CVAR_PREFIX_TIME_DISPLAY}"
 )

mm/2s2h/BenGui/BenGui.cpp

@@ -9,6 +9,7 @@
 #include "CosmeticEditor.h"
 #include "Notification.h"
 #include "2s2h/Rando/CheckTracker/CheckTracker.h"
+#include "2s2h/cvar_prefixes.h"
 
 #ifdef __APPLE__
 #include <fast/backends/gfx_metal.h>
@@ -83,15 +84,15 @@ void SetupGuiElements() {
     mBenMenuBar = std::make_shared<BenMenuBar>(CVAR_MENU_BAR_OPEN, CVarGetInteger(CVAR_MENU_BAR_OPEN, 0));
     gui->SetMenuBar(std::reinterpret_pointer_cast<Ship::GuiMenuBar>(mBenMenuBar));
 
-    if (!gui->GetMenuBar() && !CVarGetInteger("gSettings.DisableMenuShortcutNotify", 0)) {
+    if (!gui->GetMenuBar() && !CVarGetInteger(CVAR_SETTING("DisableMenuShortcutNotify"), 0)) {
 #if defined(__SWITCH__) || defined(__WIIU__)
         gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press - to access enhancements menu");
 #else
         gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press F1 to access enhancements menu");
 #endif
     }
 
-    mBenMenu = std::make_shared<BenMenu>("gWindows.Menu", "Settings Menu");
+    mBenMenu = std::make_shared<BenMenu>(CVAR_WINDOW("Menu"), "Settings Menu");
     gui->SetMenu(mBenMenu);
 
     mStatsWindow = gui->GetGuiWindow("Stats");
@@ -115,73 +116,74 @@ void SetupGuiElements() {
     }
 
     mHookDebuggerWindow =
-        std::make_shared<HookDebuggerWindow>("gWindows.HookDebugger", "Hook Debugger", ImVec2(480, 600));
+        std::make_shared<HookDebuggerWindow>(CVAR_WINDOW("HookDebugger"), "Hook Debugger", ImVec2(480, 600));
     gui->AddGuiWindow(mHookDebuggerWindow);
 
-    mSaveEditorWindow = std::make_shared<SaveEditorWindow>("gWindows.SaveEditor", "Save Editor", ImVec2(480, 600));
+    mSaveEditorWindow = std::make_shared<SaveEditorWindow>(CVAR_WINDOW("SaveEditor"), "Save Editor", ImVec2(480, 600));
     gui->AddGuiWindow(mSaveEditorWindow);
 
-    mHudEditorWindow = std::make_shared<HudEditorWindow>("gWindows.HudEditor", "HUD Editor", ImVec2(480, 600));
+    mHudEditorWindow = std::make_shared<HudEditorWindow>(CVAR_WINDOW("HudEditor"), "HUD Editor", ImVec2(480, 600));
     gui->AddGuiWindow(mHudEditorWindow);
 
     mCosmeticEditorWindow =
-        std::make_shared<CosmeticEditorWindow>("gWindows.CosmeticEditor", "Cosmetic Editor", ImVec2(480, 600));
+        std::make_shared<CosmeticEditorWindow>(CVAR_WINDOW("CosmeticEditor"), "Cosmetic Editor", ImVec2(480, 600));
     gui->AddGuiWindow(mCosmeticEditorWindow);
 
-    mActorViewerWindow = std::make_shared<ActorViewerWindow>("gWindows.ActorViewer", "Actor Viewer", ImVec2(520, 600));
+    mActorViewerWindow =
+        std::make_shared<ActorViewerWindow>(CVAR_WINDOW("ActorViewer"), "Actor Viewer", ImVec2(520, 600));
     gui->AddGuiWindow(mActorViewerWindow);
 
     mCollisionViewerWindow =
-        std::make_shared<CollisionViewerWindow>("gWindows.CollisionViewer", "Collision Viewer", ImVec2(390, 475));
+        std::make_shared<CollisionViewerWindow>(CVAR_WINDOW("CollisionViewer"), "Collision Viewer", ImVec2(390, 475));
     gui->AddGuiWindow(mCollisionViewerWindow);
 
-    mEventLogWindow = std::make_shared<EventLogWindow>("gWindows.EventLog", "Event Log", ImVec2(520, 600));
+    mEventLogWindow = std::make_shared<EventLogWindow>(CVAR_WINDOW("EventLog"), "Event Log", ImVec2(520, 600));
     gui->AddGuiWindow(mEventLogWindow);
 
-    mDLViewerWindow = std::make_shared<DLViewerWindow>("gWindows.DLViewer", "DL Viewer", ImVec2(520, 600));
+    mDLViewerWindow = std::make_shared<DLViewerWindow>(CVAR_WINDOW("DLViewer"), "DL Viewer", ImVec2(520, 600));
     gui->AddGuiWindow(mDLViewerWindow);
     mMessageViewerWindow =
-        std::make_shared<MessageViewerWindow>("gWindows.MessageViewer", "Message Viewer", ImVec2(520, 600));
+        std::make_shared<MessageViewerWindow>(CVAR_WINDOW("MessageViewer"), "Message Viewer", ImVec2(520, 600));
     gui->AddGuiWindow(mMessageViewerWindow);
 
-    mAudioEditorWindow = std::make_shared<AudioEditor>("gWindows.AudioEditor", "Audio Editor", ImVec2(520, 600));
+    mAudioEditorWindow = std::make_shared<AudioEditor>(CVAR_WINDOW("AudioEditor"), "Audio Editor", ImVec2(520, 600));
     gui->AddGuiWindow(mAudioEditorWindow);
 
-    mItemTrackerWindow = std::make_shared<ItemTrackerWindow>("gWindows.ItemTracker", "Item Tracker");
+    mItemTrackerWindow = std::make_shared<ItemTrackerWindow>(CVAR_WINDOW("ItemTracker"), "Item Tracker");
     gui->AddGuiWindow(mItemTrackerWindow);
 
-    mItemTrackerSettingsWindow = std::make_shared<ItemTrackerSettingsWindow>("gWindows.ItemTrackerSettings",
+    mItemTrackerSettingsWindow = std::make_shared<ItemTrackerSettingsWindow>(CVAR_WINDOW("ItemTrackerSettings"),
                                                                              "Item Tracker Settings", ImVec2(800, 400));
     gui->AddGuiWindow(mItemTrackerSettingsWindow);
 
-    mDisplayOverlayWindow = std::make_shared<DisplayOverlayWindow>("gWindows.DisplayOverlay", "Display Overlay");
+    mDisplayOverlayWindow = std::make_shared<DisplayOverlayWindow>(CVAR_WINDOW("DisplayOverlay"), "Display Overlay");
     gui->AddGuiWindow(mDisplayOverlayWindow);
 
-    mTimesplitsWindow = std::make_shared<TimesplitsWindow>("gWindows.Timesplits", "Time Splits Window");
+    mTimesplitsWindow = std::make_shared<TimesplitsWindow>(CVAR_WINDOW("Timesplits"), "Time Splits Window");
     gui->AddGuiWindow(mTimesplitsWindow);
 
     mTimesplitsSettingsWindow = std::make_shared<TimesplitsSettingsWindow>(
-        "gWindows.Timesplits.Settings", "Time Splits Settings Window", ImVec2(567, 97));
+        CVAR_WINDOW("Timesplits.Settings"), "Time Splits Settings Window", ImVec2(567, 97));
     gui->AddGuiWindow(mTimesplitsSettingsWindow);
 
-    mNotificationWindow = std::make_shared<Notification::Window>("gWindows.Notifications", "Notifications Window");
+    mNotificationWindow = std::make_shared<Notification::Window>(CVAR_WINDOW("Notifications"), "Notifications Window");
     gui->AddGuiWindow(mNotificationWindow);
     mNotificationWindow->Show();
 
     mRandoCheckTrackerWindow = std::make_shared<Rando::CheckTracker::CheckTrackerWindow>(
-        "gWindows.CheckTracker", "Check Tracker", ImVec2(375, 460));
+        CVAR_WINDOW("CheckTracker"), "Check Tracker", ImVec2(375, 460));
     gui->AddGuiWindow(mRandoCheckTrackerWindow);
 
     mRandoCheckTrackerSettingsWindow = std::make_shared<Rando::CheckTracker::SettingsWindow>(
-        "gWindows.CheckTrackerSettings", "Check Tracker Settings");
+        CVAR_WINDOW("CheckTrackerSettings"), "Check Tracker Settings");
     gui->AddGuiWindow(mRandoCheckTrackerSettingsWindow);
 
-    mInputViewer = std::make_shared<InputViewer>("gWindows.InputViewer", "Input Viewer");
+    mInputViewer = std::make_shared<InputViewer>(CVAR_WINDOW("InputViewer"), "Input Viewer");
     gui->AddGuiWindow(mInputViewer);
-    mInputViewerSettings = std::make_shared<InputViewerSettingsWindow>("gWindows.InputViewerSettings",
+    mInputViewerSettings = std::make_shared<InputViewerSettingsWindow>(CVAR_WINDOW("InputViewerSettings"),
                                                                        "Input Viewer Settings", ImVec2(500, 525));
     gui->AddGuiWindow(mInputViewerSettings);
-    mModalWindow = std::make_shared<BenModalWindow>("gWindows.ModalWindow", "Modal Window");
+    mModalWindow = std::make_shared<BenModalWindow>(CVAR_WINDOW("ModalWindow"), "Modal Window");
     gui->AddGuiWindow(mModalWindow);
     mModalWindow->Show();
 }

mm/2s2h/BenGui/BenInputEditorWindow.cpp

@@ -1205,28 +1205,28 @@ void BenInputEditorWindow::DrawModifierButtonsSection(uint8_t port) {
     DrawButtonLine("M1", port, BTN_CUSTOM_MODIFIER1);
     DrawButtonLine("M2", port, BTN_CUSTOM_MODIFIER2);
 
-    ImGui::BeginDisabled(CVarGetInteger("gSettings.DisableChanges", 0));
-    CVarCheckbox("Enable Speed Modifiers", "gSettings.SpeedModifier.Enable",
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+    CVarCheckbox("Enable Speed Modifiers", CVAR_SETTING("SpeedModifier.Enable"),
                  CheckboxOptions()
                      .Color(THEME_COLOR)
                      .Tooltip("Hold the assigned button to change the maximum walking or swimming speed."));
-    if (CVarGetInteger("gSettings.SpeedModifier.Enable", 0)) {
+    if (CVarGetInteger(CVAR_SETTING("SpeedModifier.Enable"), 0)) {
         UIWidgets::Spacer(5);
         Ship::GuiWindow::BeginGroupPanel("Speed Modifier", ImGui::GetContentRegionAvail());
-        CVarCheckbox("Toggle modifier instead of holding", "gSettings.SpeedModifier.Toggle",
+        CVarCheckbox("Toggle modifier instead of holding", CVAR_SETTING("SpeedModifier.Toggle"),
                      CheckboxOptions().Color(THEME_COLOR));
         Ship::GuiWindow::BeginGroupPanel("Walk Modifier", ImGui::GetContentRegionAvail());
-        CVarCheckbox("Enable Walk Speed Modifier", "gSettings.SpeedModifier.WalkEnable",
+        CVarCheckbox("Enable Walk Speed Modifier", CVAR_SETTING("SpeedModifier.WalkEnable"),
                      CheckboxOptions().Color(THEME_COLOR));
-        CVarSliderFloat("Walk Modifier 1: %.0f %%", "gSettings.SpeedModifier.WalkMapping1",
+        CVarSliderFloat("Walk Modifier 1: %.0f %%", CVAR_SETTING("SpeedModifier.WalkMapping1"),
                         FloatSliderOptions()
                             .Color(THEME_COLOR)
                             .IsPercentage()
                             .Min(0.0f)
                             .Max(15.0f)
                             .DefaultValue(1.0f)
                             .ShowAdjustmentButtons(true));
-        CVarSliderFloat("Walk Modifier 2: %.0f %%", "gSettings.SpeedModifier.WalkMapping2",
+        CVarSliderFloat("Walk Modifier 2: %.0f %%", CVAR_SETTING("SpeedModifier.WalkMapping2"),
                         FloatSliderOptions()
                             .Color(THEME_COLOR)
                             .IsPercentage()
@@ -1236,17 +1236,17 @@ void BenInputEditorWindow::DrawModifierButtonsSection(uint8_t port) {
                             .ShowAdjustmentButtons(true));
         Ship::GuiWindow::EndGroupPanel(0);
         Ship::GuiWindow::BeginGroupPanel("Swim Modifier", ImGui::GetContentRegionAvail());
-        CVarCheckbox("Enable Swim Speed Modifier", "gSettings.SpeedModifier.SwimEnable",
+        CVarCheckbox("Enable Swim Speed Modifier", CVAR_SETTING("SpeedModifier.SwimEnable"),
                      CheckboxOptions().Color(THEME_COLOR));
-        CVarSliderFloat("Swim Modifier 1: %.0f %%", "gSettings.SpeedModifier.SwimMapping1",
+        CVarSliderFloat("Swim Modifier 1: %.0f %%", CVAR_SETTING("SpeedModifier.SwimMapping1"),
                         FloatSliderOptions()
                             .Color(THEME_COLOR)
                             .IsPercentage()
                             .Min(0.0f)
                             .Max(8.75f)
                             .DefaultValue(1.0f)
                             .ShowAdjustmentButtons(true));
-        CVarSliderFloat("Swim Modifier 2: %.0f %%", "gSettings.SpeedModifier.SwimMapping2",
+        CVarSliderFloat("Swim Modifier 2: %.0f %%", CVAR_SETTING("SpeedModifier.SwimMapping2"),
                         FloatSliderOptions()
                             .Color(THEME_COLOR)
                             .IsPercentage()