mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
Convert to new-style DoState
This commit is contained in:
parent
52e4a7cf5d
commit
82ee817647
2 changed files with 25 additions and 28 deletions
|
@ -25,8 +25,7 @@ PSPGamedataInstallDialog::PSPGamedataInstallDialog() {
|
|||
PSPGamedataInstallDialog::~PSPGamedataInstallDialog() {
|
||||
}
|
||||
|
||||
int PSPGamedataInstallDialog::Init(u32 paramAddr)
|
||||
{
|
||||
int PSPGamedataInstallDialog::Init(u32 paramAddr) {
|
||||
// Already running
|
||||
if (status != SCE_UTILITY_STATUS_NONE && status != SCE_UTILITY_STATUS_SHUTDOWN)
|
||||
return SCE_ERROR_UTILITY_INVALID_STATUS;
|
||||
|
@ -37,25 +36,25 @@ int PSPGamedataInstallDialog::Init(u32 paramAddr)
|
|||
Memory::Memcpy(&request, paramAddr, size);
|
||||
|
||||
status = SCE_UTILITY_STATUS_INITIALIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int PSPGamedataInstallDialog::Abort()
|
||||
{
|
||||
int PSPGamedataInstallDialog::Abort() {
|
||||
return PSPDialog::Shutdown();
|
||||
}
|
||||
|
||||
int PSPGamedataInstallDialog::Shutdown(bool force)
|
||||
{
|
||||
if (status != SCE_UTILITY_STATUS_FINISHED && !force)
|
||||
return SCE_ERROR_UTILITY_INVALID_STATUS;
|
||||
int PSPGamedataInstallDialog::Shutdown(bool force) {
|
||||
if (status != SCE_UTILITY_STATUS_FINISHED && !force)
|
||||
return SCE_ERROR_UTILITY_INVALID_STATUS;
|
||||
|
||||
return PSPDialog::Shutdown();
|
||||
return PSPDialog::Shutdown();
|
||||
}
|
||||
|
||||
void PSPGamedataInstallDialog::DoState(PointerWrap &p) {
|
||||
PSPDialog::DoState(p);
|
||||
auto s = p.Section("PSPGamedataInstallDialog", 1);
|
||||
if (!s)
|
||||
return;
|
||||
|
||||
p.Do(request);
|
||||
p.DoMarker("PSPGamedataInstallDialog");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,21 +19,20 @@
|
|||
|
||||
#include "Core/Dialog/PSPDialog.h"
|
||||
|
||||
struct SceUtilityGamedataInstallParam
|
||||
{
|
||||
pspUtilityDialogCommon common;
|
||||
u32 unknown1;
|
||||
char gameName[13];
|
||||
char ignore1[3];
|
||||
char dataName[20];
|
||||
char gamedataParamsGameTitle[128];
|
||||
char gamedataParamsDataTitle[128];
|
||||
char gamedataParamsData[1024];
|
||||
u8 unknown2;
|
||||
char ignore2[7];
|
||||
u32 unknownResult1;
|
||||
u32 unknownResult2;
|
||||
char ignore[48];
|
||||
struct SceUtilityGamedataInstallParam {
|
||||
pspUtilityDialogCommon common;
|
||||
u32 unknown1;
|
||||
char gameName[13];
|
||||
char ignore1[3];
|
||||
char dataName[20];
|
||||
char gamedataParamsGameTitle[128];
|
||||
char gamedataParamsDataTitle[128];
|
||||
char gamedataParamsData[1024];
|
||||
u8 unknown2;
|
||||
char ignore2[7];
|
||||
u32 unknownResult1;
|
||||
u32 unknownResult2;
|
||||
char ignore[48];
|
||||
};
|
||||
|
||||
class PSPGamedataInstallDialog: public PSPDialog {
|
||||
|
@ -48,7 +47,6 @@ public:
|
|||
|
||||
int Abort();
|
||||
|
||||
|
||||
private:
|
||||
SceUtilityGamedataInstallParam request;
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue