Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #8904 from AdmiralCurtiss/freelookcamera-savestate…
…-fix

FreeLookCamera: Fix savestate branch inconsistency.
  • Loading branch information
JMC47 committed Jun 28, 2020
2 parents 2e8d1dd + 27e49c0 commit ef464ef
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Source/Core/Core/State.cpp
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions Source/Core/VideoCommon/FreeLookCamera.cpp
Expand Up @@ -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);
Expand Down

0 comments on commit ef464ef

Please sign in to comment.