This commit is contained in:
parent
843758df69
commit
cddb90cf4d
2 changed files with 9 additions and 6 deletions
|
@ -296,7 +296,7 @@ int CSaveLoadDatabase::getLoadStatus()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Loaded ok - Copy the data in
|
// Loaded ok - Copy the data in
|
||||||
restoreData();
|
restoreData(m_autoloading==true);
|
||||||
ret=FINISHED_OK;
|
ret=FINISHED_OK;
|
||||||
MEMCARD_DBGMSG("load ok :)");
|
MEMCARD_DBGMSG("load ok :)");
|
||||||
}
|
}
|
||||||
|
@ -477,7 +477,7 @@ void CSaveLoadDatabase::createData()
|
||||||
Params:
|
Params:
|
||||||
Returns:
|
Returns:
|
||||||
---------------------------------------------------------------------- */
|
---------------------------------------------------------------------- */
|
||||||
void CSaveLoadDatabase::restoreData()
|
void CSaveLoadDatabase::restoreData(int _loadSettingsOnly)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -494,11 +494,14 @@ void CSaveLoadDatabase::restoreData()
|
||||||
TranslationDatabase::loadLanguage(m_dataBuffer.m_systemDetails.m_language);
|
TranslationDatabase::loadLanguage(m_dataBuffer.m_systemDetails.m_language);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!_loadSettingsOnly)
|
||||||
|
{
|
||||||
// Game slots
|
// Game slots
|
||||||
for(i=0;i<CGameSlotManager::NUM_GAME_SLOTS;i++)
|
for(i=0;i<CGameSlotManager::NUM_GAME_SLOTS;i++)
|
||||||
{
|
{
|
||||||
CGameSlotManager::setSlotData(i,&m_dataBuffer.m_gameSlots[i]);
|
CGameSlotManager::setSlotData(i,&m_dataBuffer.m_gameSlots[i]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,7 @@ private:
|
||||||
|
|
||||||
|
|
||||||
void createData();
|
void createData();
|
||||||
void restoreData();
|
void restoreData(int _loadSettingsOnly);
|
||||||
|
|
||||||
void allocateBuffer();
|
void allocateBuffer();
|
||||||
void freeBuffer();
|
void freeBuffer();
|
||||||
|
|
Loading…
Add table
Reference in a new issue