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

[64DD] Use shadow file (*.ndr) instead of replacing loaded disk. 

(Also ignore saving when disk type is 0x6)
This commit is contained in:
luigiblood 2016-05-26 18:18:07 +02:00
parent f2e4f5abca
commit c495edd17e
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/Project64-core/N64System/N64DiskClass.cpp
View File

@ -32,9 +32,19 @@ bool CN64Disk::LoadDiskImage(const char * FileLoc)
{ {
UnallocateDiskImage(); UnallocateDiskImage();
if (!AllocateAndLoadDiskImage(FileLoc)) //Assume the file extension is *.ndd (it is the only case where it is loaded)
stdstr ShadowFile = FileLoc;
ShadowFile[ShadowFile.length() - 1] = 'r';
WriteTrace(TraceN64System, TraceDebug, "Attempt to load shadow file.");
if (!AllocateAndLoadDiskImage(ShadowFile.c_str()))
{ {
return false; WriteTrace(TraceN64System, TraceDebug, "Loading Shadow file failed");
UnallocateDiskImage();
if (!AllocateAndLoadDiskImage(FileLoc))
{
return false;
}
} }
if (g_Disk == this) if (g_Disk == this)
@ -48,11 +58,24 @@ bool CN64Disk::LoadDiskImage(const char * FileLoc)
bool CN64Disk::SaveDiskImage() bool CN64Disk::SaveDiskImage()
{ {
WriteTrace(TraceN64System, TraceDebug, "Trying to open %s", m_FileName); //NO NEED TO SAVE IF DISK TYPE IS 6
m_DiskFile.Close(); uint8_t disktype = m_DiskImage[5] & 0xF;
if (!m_DiskFile.Open(m_FileName.c_str(), CFileBase::modeWrite)) if (disktype == 0x6)
{ {
WriteTrace(TraceN64System, TraceError, "Failed to open %s", m_FileName); m_DiskFile.Close();
WriteTrace(TraceN64System, TraceDebug, "Loaded Disk Type is 0x7. No RAM area. Shadow file is not needed.");
return true;
}
//Assume the file extension is *.ndd (it is the only case where it is loaded)
stdstr ShadowFile = m_FileName;
ShadowFile[ShadowFile.length() - 1] = 'r';
WriteTrace(TraceN64System, TraceDebug, "Trying to open %s (Shadow File)", ShadowFile.c_str());
m_DiskFile.Close();
if (!m_DiskFile.Open(ShadowFile.c_str(), CFileBase::modeWrite | CFileBase::modeCreate))
{
WriteTrace(TraceN64System, TraceError, "Failed to open %s (Shadow File)", ShadowFile.c_str());
return false; return false;
} }