From 7b4c4bfc5e544af6d04331b7f82e94eab9dd184d Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Tue, 22 Dec 2015 23:24:05 +0100 Subject: [PATCH] VideoConfig: Fix stereoscopy preset settings. PR #3076 looks to be pretty poor quality and should be reverted. --- Source/Core/VideoCommon/VideoConfig.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index f7609683f8..2db0cc7633 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -101,11 +101,11 @@ void VideoConfig::Load(const std::string& ini_file) //currently these settings are not saved in global config, so we could've initialized them directly for (size_t i = 0; i < oStereoPresets.size(); ++i) { - stereoscopy->Get(StringFromFormat("StereoConvergence_%zu", i), &oStereoPresets[i].depth, iStereoConvergence); - stereoscopy->Get(StringFromFormat("StereoDepth_%zu", i), &oStereoPresets[i].convergence, iStereoDepth); + stereoscopy->Get(StringFromFormat("StereoConvergencePercentage_%zu", i), &oStereoPresets[i].convergence, iStereoConvergencePercentage); + stereoscopy->Get(StringFromFormat("StereoDepth_%zu", i), &oStereoPresets[i].depth, iStereoDepth); } stereoscopy->Get("StereoActivePreset", &iStereoActivePreset, 0); - iStereoConvergence = oStereoPresets[iStereoActivePreset].convergence; + iStereoConvergencePercentage = oStereoPresets[iStereoActivePreset].convergence; iStereoDepth = oStereoPresets[iStereoActivePreset].depth; IniFile::Section* hacks = iniFile.GetOrCreateSection("Hacks"); @@ -212,11 +212,11 @@ void VideoConfig::GameIniLoad() IniFile::Section* stereoscopy = iniFile.GetOrCreateSection("Stereoscopy"); for (size_t i = 0; i < oStereoPresets.size(); ++i) { - stereoscopy->Get(StringFromFormat("StereoConvergence_%zu", i), &oStereoPresets[i].depth, iStereoConvergence); - stereoscopy->Get(StringFromFormat("StereoDepth_%zu", i), &oStereoPresets[i].convergence, iStereoDepth); + stereoscopy->Get(StringFromFormat("StereoConvergencePercentage_%zu", i), &oStereoPresets[i].convergence, iStereoConvergencePercentage); + stereoscopy->Get(StringFromFormat("StereoDepth_%zu", i), &oStereoPresets[i].depth, iStereoDepth); } stereoscopy->Get("StereoActivePreset", &iStereoActivePreset, 0); - iStereoConvergence = oStereoPresets[iStereoActivePreset].convergence; + iStereoConvergencePercentage = oStereoPresets[iStereoActivePreset].convergence; iStereoDepth = oStereoPresets[iStereoActivePreset].depth; CHECK_SETTING("Video_Stereoscopy", "StereoMode", iStereoMode);