diff --git a/Source/Core/Core/Slippi/SlippiPlayback.cpp b/Source/Core/Core/Slippi/SlippiPlayback.cpp index d46604506d..140c8b2ff4 100644 --- a/Source/Core/Core/Slippi/SlippiPlayback.cpp +++ b/Source/Core/Core/Slippi/SlippiPlayback.cpp @@ -118,6 +118,9 @@ void SlippiPlaybackStatus::processInitialState() { INFO_LOG(SLIPPI, "saving iState"); State::SaveToBuffer(iState); + // The initial save to cState causes a stutter of about 5-10 frames + // Doing it here to get it out of the way and prevent stutters later + // Subsequent calls to SaveToBuffer for cState take ~1 frame State::SaveToBuffer(cState); SConfig::GetInstance().bHideCursor = false; }; @@ -267,12 +270,7 @@ void SlippiPlaybackStatus::loadState(s32 closestStateFrame) std::string stateString; decoder.Decode((char*)iState.data(), iState.size(), futureDiffs[closestStateFrame].get(), &stateString); std::vector stateToLoad(stateString.begin(), stateString.end()); - if (stateToLoad.size() == 0) { - std::cout << "wtf break" << std::endl; - } - else { - State::LoadFromBuffer(stateToLoad); - } + State::LoadFromBuffer(stateToLoad); } } diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index fbc1d2456a..9687d3f5b0 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -25,8 +25,6 @@ #include "Common/Timer.h" #include "Common/Version.h" -#include "Common/Logging/Log.h" - #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" @@ -242,7 +240,6 @@ void SaveToBuffer(std::vector& buffer) { Core::RunOnCPUThread( [&] { - INFO_LOG(SLIPPI, "at start of save to buffer call"); u8* ptr = nullptr; PointerWrap p(&ptr, PointerWrap::MODE_MEASURE); @@ -252,7 +249,6 @@ void SaveToBuffer(std::vector& buffer) ptr = &buffer[0]; p.SetMode(PointerWrap::MODE_WRITE); DoState(p); - INFO_LOG(SLIPPI, "at end of save to buffer call"); }, true); }