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

Use MainForm's prop to get the global ToolManager in Win32LuaLibraries

This commit is contained in:
YoshiRulz 2020-11-26 22:55:08 +10:00
parent 2c086702c9
commit 707dae93a7
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,6 @@ namespace BizHawk.Client.EmuHawk
{
public static class GlobalWin
{
public static ToolManager Tools;
public static IEmulator Emulator { get; set; }
/// <summary>

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

@ -311,7 +311,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Game = GameInfo.NullInstance;
_throttle = new Throttle();
Emulator = new NullEmulator();
GlobalWin.Tools = Tools = new ToolManager(this, Config, InputManager, Emulator, MovieSession, Game);
Tools = new ToolManager(this, Config, InputManager, Emulator, MovieSession, Game);
UpdateStatusSlots();
UpdateKeyPriorityIcon();
@ -847,7 +847,7 @@ namespace BizHawk.Client.EmuHawk
set => GlobalWin.Config = base.Config = value;
}
private readonly ToolManager Tools;
public readonly ToolManager Tools;
private DisplayManager DisplayManager => GlobalWin.DisplayManager;

8
src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
View File

@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk
public Win32LuaLibraries(
IEmulatorServiceProvider serviceProvider,
IMainFormForApi mainForm,
MainForm mainForm,
DisplayManager displayManager,
InputManager inputManager,
Config config,
@ -49,7 +49,7 @@ namespace BizHawk.Client.EmuHawk
LuaWait = new AutoResetEvent(false);
Docs.Clear();
var apiContainer = ApiManager.RestartLua(serviceProvider, LogToLuaConsole, mainForm, displayManager, inputManager, GlobalWin.Tools, config, emulator, game);
var apiContainer = ApiManager.RestartLua(serviceProvider, LogToLuaConsole, mainForm, displayManager, inputManager, mainForm.Tools, config, emulator, game);
// Register lua libraries
foreach (var lib in Client.Common.ReflectionCache.Types.Concat(EmuHawk.ReflectionCache.Types)
@ -75,7 +75,7 @@ namespace BizHawk.Client.EmuHawk
}
else if (instance is ConsoleLuaLibrary consoleLib)
{
consoleLib.Tools = GlobalWin.Tools;
consoleLib.Tools = mainForm.Tools;
_logToLuaConsoleCallback = consoleLib.Log;
}
else if (instance is GuiLuaLibrary guiLib)
@ -89,7 +89,7 @@ namespace BizHawk.Client.EmuHawk
}
else if (instance is TAStudioLuaLibrary tastudioLib)
{
tastudioLib.Tools = GlobalWin.Tools;
tastudioLib.Tools = mainForm.Tools;
}
if (instance is DelegatingLuaLibrary dlgInstance) dlgInstance.APIs = apiContainer;