Implement migrator

aMannus · Dec 23, 2024 · 9575fa7 · 9575fa7
1 parent e68c1c2
commit 9575fa7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/soh/soh/config/ConfigMigrators.h b/soh/soh/config/ConfigMigrators.h
@@ -61,11 +61,6 @@ namespace SOH {
         { MigrationAction::Rename, "gGfxDebuggerEnabled", "gOpenWindows.GfxDebugger" },
         { MigrationAction::Rename, "gStatsEnabled", "gOpenWindows.Stats" },
         { MigrationAction::Rename, "gDisableChangingSettings", "gSettings.DisableChanges" },
-        { MigrationAction::Rename, "gGameMasterVolume", "gSettings.Volume.Master" },
-        { MigrationAction::Rename, "gMainMusicVolume", "gSettings.Volume.MainMusic" },
-        { MigrationAction::Rename, "gSubMusicVolume", "gSettings.Volume.SubMusic" },
-        { MigrationAction::Rename, "gSFXMusicVolume", "gSettings.Volume.SFX" },
-        { MigrationAction::Rename, "gFanfareVolume", "gSettings.Volume.Fanfare" },
         { MigrationAction::Rename, "gExtraLatencyThreshold", "gSettings.ExtraLatencyThreshold" },
         { MigrationAction::Rename, "gImGuiScale", "gSettings.ImGuiScale" },
         { MigrationAction::Rename, "gTitleScreenTranslation", "gSettings.TitleScreenTranslation" },
@@ -77,11 +72,6 @@ namespace SOH {
         { MigrationAction::Rename, "gLowResMode", "gSettings.LowResMode" },
         { MigrationAction::Rename, "gZFightingMode", "gSettings.ZFightingMode" },
         { MigrationAction::Rename, "gDisableChangingSettings", "gSettings.DisableChanges" },
-        { MigrationAction::Rename, "gGameMasterVolume", "gSettings.Volume.Master" },
-        { MigrationAction::Rename, "gMainMusicVolume", "gSettings.Volume.MainMusic" },
-        { MigrationAction::Rename, "gSubMusicVolume", "gSettings.Volume.SubMusic" },
-        { MigrationAction::Rename, "gSFXMusicVolume", "gSettings.Volume.SFX" },
-        { MigrationAction::Rename, "gFanfareVolume", "gSettings.Volume.Fanfare" },
         { MigrationAction::Rename, "gExtraLatencyThreshold", "gSettings.ExtraLatencyThreshold" },
         { MigrationAction::Rename, "gImGuiScale", "gSettings.ImGuiScale" },
         { MigrationAction::Rename, "gTitleScreenTranslation", "gSettings.TitleScreenTranslation" },

diff --git a/soh/soh/config/ConfigUpdaters.cpp b/soh/soh/config/ConfigUpdaters.cpp
@@ -71,12 +71,28 @@ namespace SOH {
 
     void ConfigVersion3Updater::Update(Ship::Config* conf) {
         conf->EraseBlock("Controllers");
+
         if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gInjectItemCounts")) {
             CVarClear("gInjectItemCounts");
             CVarSetInteger("gEnhancements.InjectItemCounts.GoldSkulltula", 1);
             CVarSetInteger("gEnhancements.InjectItemCounts.HeartContainer", 1);
             CVarSetInteger("gEnhancements.InjectItemCounts.HeartPiece", 1);
         }
+
+        if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gGameMasterVolume")) {
+
+            CVarSetInteger("gSettings.Volume.Master", (int32_t)(CVarGetFloat("gGameMasterVolume", 1.0f) * 100));
+            CVarSetInteger("gSettings.Volume.MainMusic", (int32_t)(CVarGetFloat("gMainMusicVolume", 1.0f) * 100));
+            CVarSetInteger("gSettings.Volume.SubMusic", (int32_t)(CVarGetFloat("gSubMusicVolume", 1.0f) * 100));
+            CVarSetInteger("gSettings.Volume.SFX", (int32_t)(CVarGetFloat("gSFXMusicVolume", 1.0f) * 100));
+            CVarSetInteger("gSettings.Volume.Fanfare", (int32_t)(CVarGetFloat("gFanfareVolume", 1.0f) * 100));
+            CVarClear("gGameMasterVolume");
+            CVarClear("gMainMusicVolume");
+            CVarClear("gSubMusicVolume");
+            CVarClear("gSFXMusicVolume");
+            CVarClear("gFanfareVolume");
+        }
+
         for (Migration migration : version3Migrations) {
             if (migration.action == MigrationAction::Rename) {
                 CVarCopy(migration.from.c_str(), migration.to.value().c_str());