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

Merge pull request #1483 from oddMLan/master 

Use 8MB RDRAM if ROM is not in RDB
This commit is contained in:
zilmar 2018-08-20 14:02:01 +10:00 committed by GitHub
parent c1200514c6 8475fa9c14
commit 4c5f5c4eab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp
View File

@ -37,13 +37,15 @@ bool CSettingTypeRDBRDRamSize::Load (uint32_t /*Index*/, bool & /*Value*/ ) cons
bool CSettingTypeRDBRDRamSize::Load (uint32_t Index, uint32_t & Value ) const bool CSettingTypeRDBRDRamSize::Load (uint32_t Index, uint32_t & Value ) const
{ {
uint32_t ulValue; uint32_t ulValue;
stdstr Default;
bool existsInRdb = g_Settings->LoadStringVal(Rdb_GoodName,Default);
bool bRes = m_SettingsIniFile->GetNumber(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultValue,ulValue); bool bRes = m_SettingsIniFile->GetNumber(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultValue,ulValue);
if (!bRes) if (!bRes)
{ {
LoadDefault(Index,ulValue); LoadDefault(Index,ulValue);
} }
Value = 0x400000; Value = 0x400000;
if (ulValue == 8) if (ulValue == 8 || !existsInRdb) //default to 8MB if ROM is not in the RDB
{ {
Value = 0x800000; Value = 0x800000;
} }