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

Enable Disk based on what is loaded instead (fix Combo loading)

This commit is contained in:
LuigiBlood 2019-01-26 09:40:58 +01:00
parent b1a2fcfddd
commit 48ce8fbee7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Project64-core/N64System/N64Class.cpp
View File

@ -301,7 +301,7 @@ bool CN64System::LoadFileImage(const char * FileLoc)
{
WriteTrace(TraceN64System, TraceDebug, "Start (FileLoc: %s)", FileLoc);
CloseSystem();
g_Settings->SaveBool(Setting_EnableDisk, false);
g_Settings->SaveDword(Game_CurrentSaveState, g_Settings->LoadDefaultDword(Game_CurrentSaveState));
if (g_Settings->LoadBool(GameRunning_LoadingInProgress))
{
@ -382,6 +382,7 @@ bool CN64System::RunFileImage(const char * FileLoc)
{
return false;
}
g_Settings->SaveBool(Setting_EnableDisk, false);
if (g_Settings->LoadBool(Setting_AutoStart) != 0)
{
WriteTrace(TraceN64System, TraceDebug, "Automattically starting rom");
@ -401,6 +402,7 @@ bool CN64System::RunDiskImage(const char * FileLoc)
{
return false;
}
g_Settings->SaveBool(Setting_EnableDisk, true);
if (g_Settings->LoadBool(Setting_AutoStart) != 0)
{
WriteTrace(TraceN64System, TraceDebug, "Automattically starting rom");
@ -424,6 +426,7 @@ bool CN64System::RunDiskComboImage(const char * FileLoc, const char * FileLocDis
{
return false;
}
g_Settings->SaveBool(Setting_EnableDisk, true);
if (g_Settings->LoadBool(Setting_AutoStart) != 0)
{
WriteTrace(TraceN64System, TraceDebug, "Automattically starting rom");

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

@ -64,7 +64,6 @@ bool CN64Disk::LoadDiskImage(const char * FileLoc)
if (g_Disk == this)
{
g_Settings->SaveBool(GameRunning_LoadingInProgress, false);
g_Settings->SaveBool(Setting_EnableDisk, true);
SaveDiskSettingID(false);
}
return true;

1
Source/Project64-core/N64System/N64RomClass.cpp
View File

@ -751,7 +751,6 @@ bool CN64Rom::LoadN64ImageIPL(const char * FileLoc, bool LoadBootCodeOnly)
if (!LoadBootCodeOnly && g_DDRom == this)
{
g_Settings->SaveBool(GameRunning_LoadingInProgress, false);
g_Settings->SaveBool(Setting_EnableDisk, true);
SaveRomSettingID(false);
}