libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-20 00:41:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10014 from unknownbrackets/gamedata-state

Browse Source 
Gamedata: Fix savestates for data install
This commit is contained in:
Henrik Rydgård 2017-10-15 10:41:19 +02:00 committed by GitHub
commit ae9393cb22
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/Dialog/PSPGamedataInstallDialog.cpp
View File

@ -35,6 +35,9 @@ const static u32 GAMEDATA_BYTES_PER_READ = 32768;
// If this is too high, some games (e.g. Senjou no Valkyria 3) will lag.
const static u32 GAMEDATA_READS_PER_UPDATE = 20;
const u32 ERROR_UTILITY_GAMEDATA_MEMSTRICK_WRITE_PROTECTED = 0x80111903;
const u32 ERROR_UTILITY_GAMEDATA_MEMSTRICK_REMOVED = 0x80111901;
static const std::string SFO_FILENAME = "PARAM.SFO";
namespace
@ -95,6 +98,9 @@ int PSPGamedataInstallDialog::Init(u32 paramAddr) {
int PSPGamedataInstallDialog::Update(int animSpeed) {
if (GetStatus() != SCE_UTILITY_STATUS_RUNNING)
return SCE_ERROR_UTILITY_INVALID_STATUS;
// TODO: This should return error codes in some cases, like write failure.
// request.common.result must be updated for errors as well.
if (readFiles < numFiles) {
if (currentInputFile != 0 && currentOutputFile != 0) {
@ -244,7 +250,7 @@ void PSPGamedataInstallDialog::UpdateProgress() {
}
void PSPGamedataInstallDialog::DoState(PointerWrap &p) {
auto s = p.Section("PSPGamedataInstallDialog", 0, 3);
auto s = p.Section("PSPGamedataInstallDialog", 0, 4);
if (!s)
return;
@ -252,8 +258,8 @@ void PSPGamedataInstallDialog::DoState(PointerWrap &p) {
PSPDialog::DoState(p);
p.Do(request);
// This was included in version 2 and higher.
if (s > 2) {
// This was included in version 2 and higher, but for BC reasons we use 3+.
if (s >= 3) {
p.Do(param.ptr);
p.Do(inFileNames);
p.Do(numFiles);
@ -265,7 +271,7 @@ void PSPGamedataInstallDialog::DoState(PointerWrap &p) {
param.ptr = 0;
}
if (s > 3) {
if (s >= 4) {
p.Do(currentInputFile);
p.Do(currentInputBytesLeft);
p.Do(currentOutputFile);