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

reduce global usage in FileLoader.cs

This commit is contained in:
adelikat 2019-12-20 11:25:26 -06:00
parent bc51ca4af0
commit 88c937cd42
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BizHawk.Client.EmuHawk/FileLoader.cs
View File

@ -48,17 +48,17 @@ namespace BizHawk.Client.EmuHawk
private void LoadCdl(string filename, string archive = null) private void LoadCdl(string filename, string archive = null)
{ {
if (GlobalWin.Tools.IsAvailable<CDL>()) if (Tools.IsAvailable<CDL>())
{ {
CDL cdl = GlobalWin.Tools.Load<CDL>(); CDL cdl = Tools.Load<CDL>();
cdl.LoadFile(filename); cdl.LoadFile(filename);
} }
} }
private void LoadCheats(string filename, string archive = null) private void LoadCheats(string filename, string archive = null)
{ {
Global.CheatList.Load(filename, false); CheatList.Load(filename, false);
GlobalWin.Tools.Load<Cheats>(); Tools.Load<Cheats>();
} }
private void LoadLegacyMovie(string filename, string archive = null) private void LoadLegacyMovie(string filename, string archive = null)
@ -79,19 +79,19 @@ namespace BizHawk.Client.EmuHawk
private void LoadLuaFile(string filename, string archive = null) private void LoadLuaFile(string filename, string archive = null)
{ {
OpenLuaConsole(); OpenLuaConsole();
if (GlobalWin.Tools.Has<LuaConsole>()) if (Tools.Has<LuaConsole>())
{ {
if (OSTailoredCode.IsUnixHost) Console.WriteLine($"The Lua environment can currently only be created on Windows, {filename} will not be loaded."); if (OSTailoredCode.IsUnixHost) Console.WriteLine($"The Lua environment can currently only be created on Windows, {filename} will not be loaded.");
else GlobalWin.Tools.LuaConsole.LoadLuaFile(filename); else Tools.LuaConsole.LoadLuaFile(filename);
} }
} }
private void LoadLuaSession(string filename, string archive = null) private void LoadLuaSession(string filename, string archive = null)
{ {
OpenLuaConsole(); OpenLuaConsole();
if (GlobalWin.Tools.Has<LuaConsole>()) if (Tools.Has<LuaConsole>())
{ {
GlobalWin.Tools.LuaConsole.LoadLuaSession(filename); Tools.LuaConsole.LoadLuaSession(filename);
} }
} }
@ -126,8 +126,8 @@ namespace BizHawk.Client.EmuHawk
private void LoadWatch(string filename, string archive = null) private void LoadWatch(string filename, string archive = null)
{ {
GlobalWin.Tools.LoadRamWatch(true); Tools.LoadRamWatch(true);
((RamWatch) GlobalWin.Tools.Get<RamWatch>()).LoadWatchFile(new FileInfo(filename), false); ((RamWatch) Tools.Get<RamWatch>()).LoadWatchFile(new FileInfo(filename), false);
} }
#endregion #endregion