Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed TAS movie serialization

Browse source
This commit is contained in:
Hamish Milne 2020-04-06 21:23:39 +01:00
parent ac37de10fc
commit 7ff985cef9
5 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/core/core.cpp
View file

@ -534,6 +534,17 @@ void System::Reset() {
template <class Archive>
void System::serialize(Archive& ar, const unsigned int file_version) {
if (Archive::is_loading::value) {
// When loading, we want to make sure any lingering state gets cleared out before we begin.
// Shutdown, but persist a few things between loads...
Shutdown(true);
// Re-initialize everything like it was before
auto system_mode = this->app_loader->LoadKernelSystemMode();
auto n3ds_mode = this->app_loader->LoadKernelN3dsMode();
Init(*m_emu_window, *system_mode.first, *n3ds_mode.first);
}
u32 num_cores;
if (Archive::is_saving::value) {
num_cores = this->GetNumCores();
@ -565,11 +576,14 @@ void System::serialize(Archive& ar, const unsigned int file_version) {
ar&* memory.get();
ar&* kernel.get();
VideoCore::serialize(ar, file_version);
ar& Movie::GetInstance();
// This needs to be set from somewhere - might as well be here!
if (Archive::is_loading::value) {
Service::GSP::SetGlobalModule(*this);
memory->SetDSP(*dsp_core);
cheat_engine->Connect();
}
}