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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2021-02-20 16:31:44 +10:30
parent 6299f1c10b c1ed471fc1
commit 0252ede652
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Config/Cheats/Banjo-Kazooie (U) (V1.1).cht
View File

@ -54,7 +54,7 @@ $Have Zero Time all Levels
81386004 3000 81386004 3000
$Infinite\Air $Infinite\Air
81385F8E 0E10 813851AE 0E10
$Infinite\Always Have All Jinjos $Infinite\Always Have All Jinjos
80385F7B 00FF 80385F7B 00FF
@ -66,8 +66,7 @@ $Infinite\Gold Feathers
80385F73 00FF 80385F73 00FF
$Infinite\Health $Infinite\Health
80385F83 0008 803851A3 0008
80385F87 0008
$Infinite\Jiggies $Infinite\Jiggies
80385FCB 00FF 80385FCB 00FF

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

@ -516,11 +516,7 @@ bool CN64System::RunFileImage(const char * FileLoc)
g_Settings->SaveString(File_DiskIPLTOOLPath, FileLoc); g_Settings->SaveString(File_DiskIPLTOOLPath, FileLoc);
} }
if (g_Settings->LoadBool(Setting_AutoStart) != 0)
{
WriteTrace(TraceN64System, TraceDebug, "Automattically starting rom");
RunLoadedImage(); RunLoadedImage();
}
return true; return true;
} }
@ -538,11 +534,7 @@ bool CN64System::RunDiskImage(const char * FileLoc)
} }
g_Settings->SaveBool(Setting_EnableDisk, true); g_Settings->SaveBool(Setting_EnableDisk, true);
if (g_Settings->LoadBool(Setting_AutoStart) != 0)
{
WriteTrace(TraceN64System, TraceDebug, "Automattically starting rom");
RunLoadedImage(); RunLoadedImage();
}
return true; return true;
} }
@ -564,11 +556,7 @@ bool CN64System::RunDiskComboImage(const char * FileLoc, const char * FileLocDis
} }
g_Settings->SaveBool(Setting_EnableDisk, true); g_Settings->SaveBool(Setting_EnableDisk, true);
if (g_Settings->LoadBool(Setting_AutoStart) != 0)
{
WriteTrace(TraceN64System, TraceDebug, "Automattically starting rom");
RunLoadedImage(); RunLoadedImage();
}
return true; return true;
} }
@ -578,8 +566,12 @@ void CN64System::RunLoadedImage(void)
g_BaseSystem = new CN64System(g_Plugins, (uint32_t)time(NULL), false, false); g_BaseSystem = new CN64System(g_Plugins, (uint32_t)time(NULL), false, false);
if (g_BaseSystem) if (g_BaseSystem)
{ {
if (g_Settings->LoadBool(Setting_AutoStart) != 0)
{
WriteTrace(TraceN64System, TraceDebug, "Automattically starting rom");
g_BaseSystem->StartEmulation(true); g_BaseSystem->StartEmulation(true);
} }
}
else else
{ {
WriteTrace(TraceN64System, TraceError, "Failed to create CN64System"); WriteTrace(TraceN64System, TraceError, "Failed to create CN64System");

4
Source/Project64/UserInterface/MainMenu.cpp
View File

@ -302,6 +302,10 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
//Now we have created again, we can start up emulation //Now we have created again, we can start up emulation
if (g_BaseSystem) if (g_BaseSystem)
{ {
if (g_Settings->LoadBool(Setting_AutoStart) == 0)
{
WriteTrace(TraceN64System, TraceDebug, "Manually starting rom");
}
g_BaseSystem->StartEmulation(true); g_BaseSystem->StartEmulation(true);
} }
else else