Remove settings stuff that was not actually used anywhere.

This commit is contained in:
Jordan Woyak 2013-02-07 23:23:32 -06:00
parent 026793fa4a
commit 87bbdbf542
2 changed files with 1 additions and 24 deletions

View File

@ -100,9 +100,6 @@ SConfig::SConfig()
{ {
// Make sure we have log manager // Make sure we have log manager
LoadSettings(); LoadSettings();
//Make sure we load any extra settings
LoadSettingsWii();
} }
void SConfig::Init() void SConfig::Init()
@ -427,19 +424,4 @@ void SConfig::LoadSettings()
} }
m_SYSCONF = new SysConf(); m_SYSCONF = new SysConf();
} }
void SConfig::LoadSettingsWii()
{
IniFile ini;
//Wiimote configs
ini.Load((File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini"));
for (int i = 0; i < 4; i++)
{
char SectionName[32];
sprintf(SectionName, "Wiimote%i", i + 1);
ini.Get(SectionName, "AutoReconnectRealWiimote", &m_WiiAutoReconnect[i], false);
}
ini.Load((File::GetUserPath(D_CONFIG_IDX) + "wiimote.ini"));
ini.Get("Real", "Unpair", &m_WiiAutoUnpair, false);
}

View File

@ -41,8 +41,6 @@ struct SConfig : NonCopyable
// Wii Devices // Wii Devices
bool m_WiiSDCard; bool m_WiiSDCard;
bool m_WiiKeyboard; bool m_WiiKeyboard;
bool m_WiiAutoReconnect[4];
bool m_WiiAutoUnpair;
bool m_WiimoteReconnectOnLoad; bool m_WiimoteReconnectOnLoad;
// name of the last used filename // name of the last used filename
@ -107,9 +105,6 @@ struct SConfig : NonCopyable
// load settings // load settings
void LoadSettings(); void LoadSettings();
//Special load settings
void LoadSettingsWii();
// Return the permanent and somewhat globally used instance of this struct // Return the permanent and somewhat globally used instance of this struct
static SConfig& GetInstance() {return(*m_Instance);} static SConfig& GetInstance() {return(*m_Instance);}