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

Use `MainForm.QuicksaveLoad` directly for RA

This commit is contained in:
James Groom 2023-11-23 06:34:29 +00:00 committed by GitHub
parent 40b17b59c4
commit 525c9c2f9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -1012,8 +1012,6 @@ namespace BizHawk.Client.EmuHawk
}
}
public EmuClientApi EmuClient { get; set; }
public event BeforeQuickLoadEventHandler QuicksaveLoad;
public event BeforeQuickSaveEventHandler QuicksaveSave;

4
src/BizHawk.Client.EmuHawk/RetroAchievements/IMainFormForRetroAchievements.cs
View File

@ -9,8 +9,6 @@ namespace BizHawk.Client.EmuHawk
{
LoadRomArgs CurrentlyOpenRomArgs { get; }
EmuClientApi EmuClient { get; }
IEmulator Emulator { get; }
bool FrameInch { get; set; }
@ -23,6 +21,8 @@ namespace BizHawk.Client.EmuHawk
IMovieSession MovieSession { get; }
event BeforeQuickLoadEventHandler QuicksaveLoad;
SettingsAdapter GetSettingsAdapterForLoadedCoreUntyped();
bool LoadRom(string path, LoadRomArgs args);

4
src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegration.cs
View File

@ -142,7 +142,7 @@ namespace BizHawk.Client.EmuHawk
{
RA?.Shutdown();
_memGuard.Dispose();
_mainForm.EmuClient.BeforeQuickLoad -= QuickLoadCallback;
_mainForm.QuicksaveLoad -= QuickLoadCallback;
}
public override void OnSaveState(string path)
@ -232,7 +232,7 @@ namespace BizHawk.Client.EmuHawk
_mainForm.UpdateWindowTitle();
// note: this can only catch quicksaves (probably only case of accidential use from hotkeys)
_mainForm.EmuClient.BeforeQuickLoad += QuickLoadCallback;
_mainForm.QuicksaveLoad += QuickLoadCallback;
}
public bool OverlayActive => RA.IsOverlayFullyVisible();

4
src/BizHawk.Client.EmuHawk/RetroAchievements/RCheevos.cs
View File

@ -250,7 +250,7 @@ namespace BizHawk.Client.EmuHawk
#if false
_lboardListForm.Dispose();
#endif
_mainForm.EmuClient.BeforeQuickLoad -= QuickLoadCallback;
_mainForm.QuicksaveLoad -= QuickLoadCallback;
}
public override void OnSaveState(string path)
@ -428,7 +428,7 @@ namespace BizHawk.Client.EmuHawk
Update();
// note: this can only catch quicksaves (probably only case of accidential use from hotkeys)
_mainForm.EmuClient.BeforeQuickLoad += QuickLoadCallback;
_mainForm.QuicksaveLoad += QuickLoadCallback;
}
public override void Update()

2
src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -37,7 +37,7 @@ namespace BizHawk.Client.EmuHawk
private IExternalApiProvider ApiProvider
{
get => _apiProvider;
set => _owner.EmuClient = (EmuClientApi) (_apiProvider = value).GetApi<IEmuClientApi>();
set => _apiProvider = value;
}
/// <summary>