[Project64] Clean up settings

This commit is contained in:
zilmar 2016-04-28 19:34:29 +10:00
parent c187bc1e91
commit d4bddb3892
7 changed files with 228 additions and 207 deletions

View File

@ -62,19 +62,6 @@ void CSettingTypeCheats::GameChanged ( void * /*Data */ )
*m_SectionIdent = g_Settings->LoadStringVal(Game_IniKey); *m_SectionIdent = g_Settings->LoadStringVal(Game_IniKey);
} }
/*stdstr CSettingTypeCheats::FixName ( const char * Section, const char * Name )
{
}
const char * CSettingTypeCheats::SectionName ( void ) const
{
return "";
}
void CSettingTypeCheats::UpdateSettings ( void * )
{
g_Notify->BreakPoint(__FILE__, __LINE__);
}*/
bool CSettingTypeCheats::Load ( int /*Index*/, bool & /*Value*/ ) const bool CSettingTypeCheats::Load ( int /*Index*/, bool & /*Value*/ ) const
{ {

View File

@ -83,7 +83,9 @@ bool CSettingTypeGame::Load ( int Index, bool & Value ) const
if (g_Settings->IndexBasedSetting(m_DefaultSetting)) if (g_Settings->IndexBasedSetting(m_DefaultSetting))
{ {
return g_Settings->LoadBoolIndex(m_DefaultSetting, Index, Value); return g_Settings->LoadBoolIndex(m_DefaultSetting, Index, Value);
} else { }
else
{
return g_Settings->LoadBool(m_DefaultSetting, Value); return g_Settings->LoadBool(m_DefaultSetting, Value);
} }
} }
@ -97,7 +99,9 @@ bool CSettingTypeGame::Load ( int Index, uint32_t & Value ) const
if (g_Settings->IndexBasedSetting(m_DefaultSetting)) if (g_Settings->IndexBasedSetting(m_DefaultSetting))
{ {
return g_Settings->LoadDwordIndex(m_DefaultSetting, Index, Value); return g_Settings->LoadDwordIndex(m_DefaultSetting, Index, Value);
} else { }
else
{
return g_Settings->LoadDword(m_DefaultSetting, Value); return g_Settings->LoadDword(m_DefaultSetting, Value);
} }
} }
@ -111,7 +115,9 @@ bool CSettingTypeGame::Load ( int Index, stdstr & Value ) const
if (g_Settings->IndexBasedSetting(m_DefaultSetting)) if (g_Settings->IndexBasedSetting(m_DefaultSetting))
{ {
return g_Settings->LoadStringIndex(m_DefaultSetting, Index, Value); return g_Settings->LoadStringIndex(m_DefaultSetting, Index, Value);
} else { }
else
{
return g_Settings->LoadStringVal(m_DefaultSetting, Value); return g_Settings->LoadStringVal(m_DefaultSetting, Value);
} }
} }
@ -126,10 +132,14 @@ void CSettingTypeGame::LoadDefault ( int Index, bool & Value ) const
if (g_Settings->IndexBasedSetting(m_DefaultSetting)) if (g_Settings->IndexBasedSetting(m_DefaultSetting))
{ {
g_Settings->LoadDefaultBoolIndex(m_DefaultSetting, Index, Value); g_Settings->LoadDefaultBoolIndex(m_DefaultSetting, Index, Value);
} else { }
else
{
g_Settings->LoadDefaultBool(m_DefaultSetting, Value); g_Settings->LoadDefaultBool(m_DefaultSetting, Value);
} }
} else { }
else
{
CSettingTypeApplication::LoadDefault(Index, Value); CSettingTypeApplication::LoadDefault(Index, Value);
} }
} }
@ -141,10 +151,14 @@ void CSettingTypeGame::LoadDefault ( int Index, uint32_t & Value ) const
if (g_Settings->IndexBasedSetting(m_DefaultSetting)) if (g_Settings->IndexBasedSetting(m_DefaultSetting))
{ {
g_Settings->LoadDefaultDwordIndex(m_DefaultSetting, Index, Value); g_Settings->LoadDefaultDwordIndex(m_DefaultSetting, Index, Value);
} else { }
else
{
g_Settings->LoadDefaultDword(m_DefaultSetting, Value); g_Settings->LoadDefaultDword(m_DefaultSetting, Value);
} }
} else { }
else
{
CSettingTypeApplication::LoadDefault(Index, Value); CSettingTypeApplication::LoadDefault(Index, Value);
} }
} }
@ -156,10 +170,14 @@ void CSettingTypeGame::LoadDefault ( int Index, stdstr & Value ) const
if (g_Settings->IndexBasedSetting(m_DefaultSetting)) if (g_Settings->IndexBasedSetting(m_DefaultSetting))
{ {
g_Settings->LoadDefaultStringIndex(m_DefaultSetting, Index, Value); g_Settings->LoadDefaultStringIndex(m_DefaultSetting, Index, Value);
} else { }
else
{
g_Settings->LoadDefaultString(m_DefaultSetting, Value); g_Settings->LoadDefaultString(m_DefaultSetting, Value);
} }
} else { }
else
{
CSettingTypeApplication::LoadDefault(Index, Value); CSettingTypeApplication::LoadDefault(Index, Value);
} }
} }
@ -182,10 +200,14 @@ void CSettingTypeGame::Save ( int Index, bool Value )
if (g_Settings->IndexBasedSetting(m_DefaultSetting)) if (g_Settings->IndexBasedSetting(m_DefaultSetting))
{ {
g_Settings->SaveBoolIndex(m_DefaultSetting, Index, Value); g_Settings->SaveBoolIndex(m_DefaultSetting, Index, Value);
} else { }
else
{
g_Settings->SaveBool(m_DefaultSetting, Value); g_Settings->SaveBool(m_DefaultSetting, Value);
} }
} else { }
else
{
CSettingTypeApplication::Save(Index, Value); CSettingTypeApplication::Save(Index, Value);
} }
} }
@ -207,10 +229,14 @@ void CSettingTypeGame::Save ( int Index, uint32_t Value )
if (g_Settings->IndexBasedSetting(m_DefaultSetting)) if (g_Settings->IndexBasedSetting(m_DefaultSetting))
{ {
g_Settings->SaveDwordIndex(m_DefaultSetting, Index, Value); g_Settings->SaveDwordIndex(m_DefaultSetting, Index, Value);
} else { }
else
{
g_Settings->SaveDword(m_DefaultSetting, Value); g_Settings->SaveDword(m_DefaultSetting, Value);
} }
} else { }
else
{
CSettingTypeApplication::Save(Index, Value); CSettingTypeApplication::Save(Index, Value);
} }
} }
@ -237,10 +263,14 @@ void CSettingTypeGame::Save ( int Index, const char * Value )
if (g_Settings->IndexBasedSetting(m_DefaultSetting)) if (g_Settings->IndexBasedSetting(m_DefaultSetting))
{ {
g_Settings->SaveStringIndex(m_DefaultSetting, Index, Value); g_Settings->SaveStringIndex(m_DefaultSetting, Index, Value);
} else { }
else
{
g_Settings->SaveString(m_DefaultSetting, Value); g_Settings->SaveString(m_DefaultSetting, Value);
} }
} else { }
else
{
CSettingTypeApplication::Save(Index, Value); CSettingTypeApplication::Save(Index, Value);
} }
} }
@ -252,10 +282,14 @@ void CSettingTypeGame::Delete ( int Index )
if (g_Settings->IndexBasedSetting(m_DefaultSetting)) if (g_Settings->IndexBasedSetting(m_DefaultSetting))
{ {
g_Settings->DeleteSettingIndex(m_DefaultSetting, Index); g_Settings->DeleteSettingIndex(m_DefaultSetting, Index);
} else { }
else
{
g_Settings->DeleteSetting(m_DefaultSetting); g_Settings->DeleteSetting(m_DefaultSetting);
} }
} else { }
else
{
CSettingTypeApplication::Delete(Index); CSettingTypeApplication::Delete(Index);
} }
} }