Savestates now work okay between git versions.

This commit is contained in:
Unknown W. Brackets 2013-09-29 20:27:51 -07:00
parent b7fbf5942f
commit 06ae016782

View File

@ -703,12 +703,10 @@ public:
static Error Load(const std::string& _rFilename, int _Revision, const char *_VersionString, T& _class, std::string* _failureReason) static Error Load(const std::string& _rFilename, int _Revision, const char *_VersionString, T& _class, std::string* _failureReason)
{ {
INFO_LOG(COMMON, "ChunkReader: Loading %s" , _rFilename.c_str()); INFO_LOG(COMMON, "ChunkReader: Loading %s" , _rFilename.c_str());
_failureReason->clear(); *_failureReason = "LoadStateWrongVersion";
_failureReason->append("LoadStateWrongVersion");
if (!File::Exists(_rFilename)) { if (!File::Exists(_rFilename)) {
_failureReason->clear(); *_failureReason = "LoadStateDoesntExist";
_failureReason->append("LoadStateDoesntExist");
ERROR_LOG(COMMON, "ChunkReader: File doesn't exist"); ERROR_LOG(COMMON, "ChunkReader: File doesn't exist");
return ERROR_BAD_FILE; return ERROR_BAD_FILE;
} }
@ -744,12 +742,6 @@ public:
header.Revision, _Revision); header.Revision, _Revision);
return ERROR_BAD_FILE; return ERROR_BAD_FILE;
} }
if (strcmp(header.GitVersion, _VersionString) != 0)
{
WARN_LOG(COMMON, "This savestate was generated by a different version of PPSSPP, %s. It may not load properly.",
header.GitVersion);
}
// get size // get size
const int sz = (int)(fileSize - headerSize); const int sz = (int)(fileSize - headerSize);
@ -786,6 +778,7 @@ public:
delete[] buf; delete[] buf;
INFO_LOG(COMMON, "ChunkReader: Done loading %s" , _rFilename.c_str()); INFO_LOG(COMMON, "ChunkReader: Done loading %s" , _rFilename.c_str());
_failureReason->clear();
return error; return error;
} }