mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-01 10:13:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BootManager: Vertically align where sensible to do so

Browse Source
This commit is contained in:
Lioncash 2016-01-26 20:37:44 -05:00
parent 0c920f175f
commit d7d0673900
1 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/Core/BootManager.cpp
View File

@ -81,14 +81,14 @@ private:
int iSelectedLanguage; int iSelectedLanguage;
int iCPUCore; int iCPUCore;
int Volume; int Volume;
std::array<int, MAX_BBMOTES> iWiimoteSource;
std::array<SIDevices, MAX_SI_CHANNELS> Pads;
std::array<TEXIDevices, MAX_EXI_CHANNELS> m_EXIDevice;
unsigned int frameSkip; unsigned int frameSkip;
float m_EmulationSpeed; float m_EmulationSpeed;
std::string strBackend; std::string strBackend;
std::string sBackend; std::string sBackend;
std::string m_strGPUDeterminismMode; std::string m_strGPUDeterminismMode;
std::array<int, MAX_BBMOTES> iWiimoteSource;
std::array<SIDevices, MAX_SI_CHANNELS> Pads;
std::array<TEXIDevices, MAX_EXI_CHANNELS> m_EXIDevice;
}; };
void ConfigCache::SaveConfig(const SConfig& config) void ConfigCache::SaveConfig(const SConfig& config)
@ -112,24 +112,22 @@ void ConfigCache::SaveConfig(const SConfig& config)
iSelectedLanguage = config.SelectedLanguage; iSelectedLanguage = config.SelectedLanguage;
iCPUCore = config.iCPUCore; iCPUCore = config.iCPUCore;
Volume = config.m_Volume; Volume = config.m_Volume;
m_EmulationSpeed = config.m_EmulationSpeed;
frameSkip = config.m_FrameSkip;
strBackend = config.m_strVideoBackend;
sBackend = config.sBackend;
m_strGPUDeterminismMode = config.m_strGPUDeterminismMode;
std::copy(std::begin(g_wiimote_sources), std::end(g_wiimote_sources), std::begin(iWiimoteSource)); std::copy(std::begin(g_wiimote_sources), std::end(g_wiimote_sources), std::begin(iWiimoteSource));
std::copy(std::begin(config.m_SIDevice), std::end(config.m_SIDevice), std::begin(Pads)); std::copy(std::begin(config.m_SIDevice), std::end(config.m_SIDevice), std::begin(Pads));
std::copy(std::begin(config.m_EXIDevice), std::end(config.m_EXIDevice), std::begin(m_EXIDevice)); std::copy(std::begin(config.m_EXIDevice), std::end(config.m_EXIDevice), std::begin(m_EXIDevice));
m_EmulationSpeed = config.m_EmulationSpeed;
frameSkip = config.m_FrameSkip;
strBackend = config.m_strVideoBackend;
sBackend = config.sBackend;
m_strGPUDeterminismMode = config.m_strGPUDeterminismMode;
bSetEmulationSpeed = false; bSetEmulationSpeed = false;
bSetVolume = false; bSetVolume = false;
bSetFrameSkip = false;
bSetWiimoteSource.fill(false); bSetWiimoteSource.fill(false);
bSetPads.fill(false); bSetPads.fill(false);
bSetEXIDevice.fill(false); bSetEXIDevice.fill(false);
bSetFrameSkip = false;
} }
void ConfigCache::RestoreConfig(SConfig* config) void ConfigCache::RestoreConfig(SConfig* config)
@ -152,12 +150,13 @@ void ConfigCache::RestoreConfig(SConfig* config)
config->bDSPHLE = bDSPHLE; config->bDSPHLE = bDSPHLE;
config->bHLE_BS2 = bHLE_BS2; config->bHLE_BS2 = bHLE_BS2;
config->bProgressive = bProgressive; config->bProgressive = bProgressive;
config->m_SYSCONF->SetData("IPL.PGS", bProgressive);
config->bPAL60 = bPAL60; config->bPAL60 = bPAL60;
config->m_SYSCONF->SetData("IPL.E60", bPAL60);
config->SelectedLanguage = iSelectedLanguage; config->SelectedLanguage = iSelectedLanguage;
config->iCPUCore = iCPUCore; config->iCPUCore = iCPUCore;
config->m_SYSCONF->SetData("IPL.PGS", bProgressive);
config->m_SYSCONF->SetData("IPL.E60", bPAL60);
// Only change these back if they were actually set by game ini, since they can be changed while a game is running. // Only change these back if they were actually set by game ini, since they can be changed while a game is running.
if (bSetVolume) if (bSetVolume)
config->m_Volume = Volume; config->m_Volume = Volume;