ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Fix up plugin registering settings with default setting

This commit is contained in:
zilmar 2016-03-22 07:55:44 +11:00
parent bdc109b0b8
commit ec23b07302
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp
View File

@ -46,7 +46,7 @@ CSettingTypeRomDatabase::CSettingTypeRomDatabase(const char * Name, const char *
} }
CSettingTypeRomDatabase::CSettingTypeRomDatabase(const char * Name, SettingID DefaultSetting, bool DeleteOnDefault ) : CSettingTypeRomDatabase::CSettingTypeRomDatabase(const char * Name, SettingID DefaultSetting, bool DeleteOnDefault ) :
m_KeyName(Name), m_KeyName(StripNameSection(Name)),
m_DefaultStr(""), m_DefaultStr(""),
m_DefaultValue(0), m_DefaultValue(0),
m_DefaultSetting(DefaultSetting), m_DefaultSetting(DefaultSetting),

35
Source/Project64-core/Settings/SettingsClass.cpp
View File

@ -524,26 +524,35 @@ void CSettings::RegisterSetting(CSettings * _this, SettingID ID, SettingID Defau
switch (DataType) switch (DataType)
{ {
case Data_DWORD: case Data_DWORD:
if (DefaultID == Default_None)
{ {
SettingID RdbSetting = (SettingID)_this->m_NextAutoSettingId; SettingID RdbSetting = (SettingID)_this->m_NextAutoSettingId;
_this->m_NextAutoSettingId += 1; _this->m_NextAutoSettingId += 1;
_this->AddHandler(RdbSetting, new CSettingTypeRomDatabase(Name.c_str(), (int)Value)); if (DefaultID == Default_None)
_this->AddHandler(ID, new CSettingTypeGame(Name.c_str(), RdbSetting)); {
} _this->AddHandler(RdbSetting, new CSettingTypeRomDatabase(Name.c_str(), (int)Value));
else _this->AddHandler(ID, new CSettingTypeGame(Name.c_str(), RdbSetting));
{ }
_this->AddHandler(ID, new CSettingTypeGame(Name.c_str(), DefaultID)); else
{
_this->AddHandler(RdbSetting, new CSettingTypeRomDatabase(Name.c_str(), DefaultID));
_this->AddHandler(ID, new CSettingTypeGame(Name.c_str(), RdbSetting));
}
} }
break; break;
case Data_String: case Data_String:
if (DefaultID == Default_None)
{ {
_this->AddHandler(ID, new CSettingTypeGame(Name.c_str(), "")); SettingID RdbSetting = (SettingID)_this->m_NextAutoSettingId;
} _this->m_NextAutoSettingId += 1;
else if (DefaultID == Default_None)
{ {
_this->AddHandler(ID, new CSettingTypeGame(Name.c_str(), DefaultID)); _this->AddHandler(RdbSetting, new CSettingTypeRomDatabase(Name.c_str(), ""));
_this->AddHandler(ID, new CSettingTypeGame(Name.c_str(), RdbSetting));
}
else
{
_this->AddHandler(RdbSetting, new CSettingTypeRomDatabase(Name.c_str(), DefaultID));
_this->AddHandler(ID, new CSettingTypeGame(Name.c_str(), RdbSetting));
}
} }
break; break;
default: default: