ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8904 from AdmiralCurtiss/freelookcamera-savestate-fix 

FreeLookCamera: Fix savestate branch inconsistency.
This commit is contained in:
JMC47 2020-06-27 20:42:23 -04:00 committed by GitHub
parent 2e8d1dd1db 27e49c00b3
commit ef464effaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/State.cpp
View File

@ -74,7 +74,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system
constexpr u32 STATE_VERSION = 119; // Last changed in PR 8820
constexpr u32 STATE_VERSION = 120; // Last changed in PR 8904
// Maps savestate versions to Dolphin versions.
// Versions after 42 don't need to be added to this list,

2
Source/Core/VideoCommon/FreeLookCamera.cpp
View File

@ -274,6 +274,8 @@ void FreeLookCamera::DoState(PointerWrap& p)
{
const auto old_type = m_current_type;
p.Do(m_current_type);
p.Do(m_fov_x);
p.Do(m_fov_y);
if (old_type == m_current_type)
{
m_camera_controller->DoState(p);