libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-06 00:18:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2432 from thedax/saveStateFailReasons

Browse Source 
Add failure reasons to savestate OSMs.
This commit is contained in:
Henrik Rydgård 2013-06-24 13:48:33 -07:00
commit 232fb06360
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Common/ChunkFile.h
View File

@ -581,12 +581,18 @@ class CChunkFileReader
public:
// Load file template
template<class T>
static bool Load(const std::string& _rFilename, int _Revision, T& _class)
static bool Load(const std::string& _rFilename, int _Revision, T& _class, std::string* _failureReason)
{
INFO_LOG(COMMON, "ChunkReader: Loading %s" , _rFilename.c_str());
_failureReason->clear();
_failureReason->append("LoadStateWrongVersion");
if (!File::Exists(_rFilename))
if (!File::Exists(_rFilename)) {
_failureReason->clear();
_failureReason->append("LoadStateDoesntExist");
ERROR_LOG(COMMON, "ChunkReader: File doesn't exist");
return false;
}
// Check file size
const u64 fileSize = File::GetSize(_rFilename);
@ -664,6 +670,7 @@ public:
static bool Save(const std::string& _rFilename, int _Revision, T& _class)
{
INFO_LOG(COMMON, "ChunkReader: Writing %s" , _rFilename.c_str());
File::IOFile pFile(_rFilename, "wb");
if (!pFile)
{

18
Core/SaveState.cpp
View File

@ -31,6 +31,7 @@
#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/System.h"
#include "UI/OnScreenDisplay.h"
#include "i18n/i18n.h"
namespace SaveState
{
@ -218,6 +219,9 @@ namespace SaveState
{
Operation &op = operations[i];
bool result;
std::string reason;
I18NCategory *s = GetI18NCategory("Screen");
switch (op.type)
{
@ -225,16 +229,23 @@ namespace SaveState
if (MIPSComp::jit)
MIPSComp::jit->ClearCache();
INFO_LOG(COMMON, "Loading state from %s", op.filename.c_str());
osm.Show("Loaded state", 2.0);
result = CChunkFileReader::Load(op.filename, REVISION, state);
result = CChunkFileReader::Load(op.filename, REVISION, state, &reason);
if(result)
osm.Show(s->T("Loaded State"), 2.0);
else {
osm.Show(s->T(reason.c_str(), "Load savestate failed"), 2.0);
}
break;
case SAVESTATE_SAVE:
if (MIPSComp::jit)
MIPSComp::jit->ClearCache();
INFO_LOG(COMMON, "Saving state to %s", op.filename.c_str());
osm.Show("Saved state", 2.0);
result = CChunkFileReader::Save(op.filename, REVISION, state);
if(result)
osm.Show(s->T("Saved State"), 2.0);
else
osm.Show(s->T("Save State Failed"), 2.0);
break;
case SAVESTATE_VERIFY:
@ -244,7 +255,6 @@ namespace SaveState
default:
ERROR_LOG(COMMON, "Savestate failure: unknown operation type %d", op.type);
result = false;
break;
}