Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-18 06:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

System: Update running game when media changes from save state

Browse source
This commit is contained in:
Connor McLaughlin 2020-01-24 14:50:48 +10:00
parent f2d5ce74df
commit 0a5f7fcd75
4 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/cdrom.cpp
View file

@ -120,8 +120,6 @@ bool CDROM::DoState(StateWrapper& sw)
sw.Do(&m_sector_buffer); sw.Do(&m_sector_buffer);
u32 media_lba = m_media ? m_media->GetPositionOnDisc() : 0; u32 media_lba = m_media ? m_media->GetPositionOnDisc() : 0;
std::string media_filename = m_media ? m_media->GetFileName() : std::string();
sw.Do(&media_filename);
sw.Do(&media_lba); sw.Do(&media_lba);
if (sw.IsReading()) if (sw.IsReading())
@ -132,21 +130,24 @@ bool CDROM::DoState(StateWrapper& sw)
m_system->SetDowncount(m_drive_remaining_ticks); m_system->SetDowncount(m_drive_remaining_ticks);
// load up media if we had something in there before // load up media if we had something in there before
m_media.reset(); if (m_media && !m_media->Seek(media_lba))
if (!media_filename.empty())
{ {
m_media = CDImage::Open(media_filename.c_str()); Log_ErrorPrint("Failed to seek CD media from save state. Ejecting.");
if (!m_media || !m_media->Seek(media_lba)) RemoveMedia();
{
Log_ErrorPrintf("Failed to re-insert CD media from save state: '%s'. Ejecting.", media_filename.c_str());
RemoveMedia();
}
} }
} }
return !sw.HasError(); return !sw.HasError();
} }
std::string CDROM::GetMediaFileName() const
{
if (!m_media)
return std::string();
return m_media->GetFileName();
}
void CDROM::InsertMedia(std::unique_ptr<CDImage> media) void CDROM::InsertMedia(std::unique_ptr<CDImage> media)
{ {
if (HasMedia()) if (HasMedia())

1
src/core/cdrom.h
View file

@ -27,6 +27,7 @@ public:
bool DoState(StateWrapper& sw); bool DoState(StateWrapper& sw);
bool HasMedia() const { return static_cast<bool>(m_media); } bool HasMedia() const { return static_cast<bool>(m_media); }
std::string GetMediaFileName() const;
void InsertMedia(std::unique_ptr<CDImage> media); void InsertMedia(std::unique_ptr<CDImage> media);
void RemoveMedia(); void RemoveMedia();

2
src/core/host_interface.cpp
View file

@ -497,7 +497,7 @@ void HostInterface::ResetPerformanceCounters()
void HostInterface::UpdateRunningGame(const char* path, CDImage* image) void HostInterface::UpdateRunningGame(const char* path, CDImage* image)
{ {
if (!path) if (!path || std::strlen(path) == 0)
{ {
OnRunningGameChanged("", "", ""); OnRunningGameChanged("", "", "");
return; return;

20
src/core/system.cpp
View file

@ -238,6 +238,26 @@ bool System::DoState(StateWrapper& sw)
sw.Do(&m_internal_frame_number); sw.Do(&m_internal_frame_number);
sw.Do(&m_global_tick_counter); sw.Do(&m_global_tick_counter);
std::string media_filename = m_cdrom->GetMediaFileName();
sw.Do(&media_filename);
if (sw.IsReading())
{
std::unique_ptr<CDImage> media;
if (!media_filename.empty())
{
media = CDImage::Open(media_filename.c_str());
if (!media)
Log_ErrorPrintf("Failed to open CD image from save state: '%s'", media_filename.c_str());
}
m_host_interface->UpdateRunningGame(media_filename.c_str(), media.get());
if (media)
m_cdrom->InsertMedia(std::move(media));
else
m_cdrom->RemoveMedia();
}
if (!sw.DoMarker("CPU") || !m_cpu->DoState(sw)) if (!sw.DoMarker("CPU") || !m_cpu->DoState(sw))
return false; return false;