mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-24 22:34:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

State.cpp: Extract the savestate version logic into its own function for clarity.

Browse source
This commit is contained in:
Admiral H. Curtiss 2015-07-24 17:13:40 +02:00
parent 429f4ea158
commit 1772eeb32f
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Source/Core/Core/State.cpp
View file

@ -119,7 +119,8 @@ void EnableCompression(bool compression)
g_use_compression = compression; g_use_compression = compression;
} }
static std::string DoState(PointerWrap& p) // Returns true if state version matches current Dolphin state version, false otherwise.
static bool DoStateVersion(PointerWrap& p, std::string* version_created_by)
{ {
u32 version = STATE_VERSION; u32 version = STATE_VERSION;
{ {
@ -129,15 +130,15 @@ static std::string DoState(PointerWrap& p)
version = cookie - COOKIE_BASE; version = cookie - COOKIE_BASE;
} }
std::string version_created_by = scm_rev_str; *version_created_by = scm_rev_str;
if (version > 42) if (version > 42)
p.Do(version_created_by); p.Do(*version_created_by);
else else
version_created_by.clear(); version_created_by->clear();
if (version != STATE_VERSION) if (version != STATE_VERSION)
{ {
if (version_created_by.empty() && s_old_versions.count(version)) if (version_created_by->empty() && s_old_versions.count(version))
{ {
// The savestate is from an old version that doesn't // The savestate is from an old version that doesn't
// save the Dolphin version number to savestates, but // save the Dolphin version number to savestates, but
@ -148,9 +149,21 @@ static std::string DoState(PointerWrap& p)
std::string oldest_version = version_range.first; std::string oldest_version = version_range.first;
std::string newest_version = version_range.second; std::string newest_version = version_range.second;
version_created_by = "Dolphin " + oldest_version + " - " + newest_version; *version_created_by = "Dolphin " + oldest_version + " - " + newest_version;
} }
return false;
}
p.DoMarker("Version");
return true;
}
static std::string DoState(PointerWrap& p)
{
std::string version_created_by;
if (!DoStateVersion(p, &version_created_by))
{
// because the version doesn't match, fail. // because the version doesn't match, fail.
// this will trigger an OSD message like "Can't load state from other revisions" // this will trigger an OSD message like "Can't load state from other revisions"
// we could use the version numbers to maintain some level of backward compatibility, but currently don't. // we could use the version numbers to maintain some level of backward compatibility, but currently don't.
@ -158,8 +171,6 @@ static std::string DoState(PointerWrap& p)
return version_created_by; return version_created_by;
} }
p.DoMarker("Version");
// Begin with video backend, so that it gets a chance to clear its caches and writeback modified things to RAM // Begin with video backend, so that it gets a chance to clear its caches and writeback modified things to RAM
g_video_backend->DoState(p); g_video_backend->DoState(p);
p.DoMarker("video_backend"); p.DoMarker("video_backend");