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

MainForm - convert some commonly used globals to properties that reference the global. A step twards the global not being there at all and mainform managing the passing of dependencies

This commit is contained in:
adelikat 2019-12-20 09:29:33 -06:00
parent 7ba8af1cb9
commit 62ab716a5d
4 changed files with 658 additions and 655 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

654
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

File diff suppressed because it is too large Load Diff

198
BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -30,10 +30,10 @@ namespace BizHawk.Client.EmuHawk
HardReset();
break;
case "Quick Load":
LoadQuickSave($"QuickSave{Global.Config.SaveSlot}");
LoadQuickSave($"QuickSave{Config.SaveSlot}");
break;
case "Quick Save":
SaveQuickSave($"QuickSave{Global.Config.SaveSlot}");
SaveQuickSave($"QuickSave{Config.SaveSlot}");
break;
case "Clear Autohold":
ClearAutohold();
@ -44,7 +44,7 @@ namespace BizHawk.Client.EmuHawk
case "Screen Raw to Clipboard":
// Ctrl+C clash. any tool that has such acc must check this.
// maybe check if mainform has focus instead?
if (GlobalWin.Tools.IsLoaded<TAStudio>() && GlobalWin.Tools.Get<TAStudio>().ContainsFocus)
if (Tools.IsLoaded<TAStudio>() && Tools.Get<TAStudio>().ContainsFocus)
{
break;
}
@ -64,7 +64,7 @@ namespace BizHawk.Client.EmuHawk
CloseRom();
break;
case "Load Last ROM":
LoadRomFromRecent(Global.Config.RecentRoms.MostRecent);
LoadRomFromRecent(Config.RecentRoms.MostRecent);
break;
case "Flush SaveRAM":
FlushSaveRAM();
@ -125,8 +125,8 @@ namespace BizHawk.Client.EmuHawk
RebootCore();
break;
case "Toggle Skip Lag Frame":
Global.Config.SkipLagFrame ^= true;
AddOnScreenMessage($"Skip Lag Frames toggled {(Global.Config.SkipLagFrame ? "On" : "Off")}");
Config.SkipLagFrame ^= true;
AddOnScreenMessage($"Skip Lag Frames toggled {(Config.SkipLagFrame ? "On" : "Off")}");
break;
case "Toggle Key Priority":
ToggleKeyPriority();
@ -135,102 +135,102 @@ namespace BizHawk.Client.EmuHawk
// Save States
case "Save State 0":
SaveQuickSave("QuickSave0");
Global.Config.SaveSlot = 0;
Config.SaveSlot = 0;
UpdateStatusSlots();
break;
case "Save State 1":
SaveQuickSave("QuickSave1");
Global.Config.SaveSlot = 1;
Config.SaveSlot = 1;
UpdateStatusSlots();
break;
case "Save State 2":
SaveQuickSave("QuickSave2");
Global.Config.SaveSlot = 2;
Config.SaveSlot = 2;
UpdateStatusSlots();
break;
case "Save State 3":
SaveQuickSave("QuickSave3");
Global.Config.SaveSlot = 3;
Config.SaveSlot = 3;
UpdateStatusSlots();
break;
case "Save State 4":
SaveQuickSave("QuickSave4");
Global.Config.SaveSlot = 4;
Config.SaveSlot = 4;
UpdateStatusSlots();
break;
case "Save State 5":
SaveQuickSave("QuickSave5");
Global.Config.SaveSlot = 5;
Config.SaveSlot = 5;
UpdateStatusSlots();
break;
case "Save State 6":
SaveQuickSave("QuickSave6");
Global.Config.SaveSlot = 6;
Config.SaveSlot = 6;
UpdateStatusSlots();
break;
case "Save State 7":
SaveQuickSave("QuickSave7");
Global.Config.SaveSlot = 7;
Config.SaveSlot = 7;
UpdateStatusSlots();
break;
case "Save State 8":
SaveQuickSave("QuickSave8");
Global.Config.SaveSlot = 8;
Config.SaveSlot = 8;
UpdateStatusSlots();
break;
case "Save State 9":
SaveQuickSave("QuickSave9");
Global.Config.SaveSlot = 9;
Config.SaveSlot = 9;
UpdateStatusSlots();
break;
case "Load State 0":
LoadQuickSave("QuickSave0");
Global.Config.SaveSlot = 0;
Config.SaveSlot = 0;
UpdateStatusSlots();
break;
case "Load State 1":
LoadQuickSave("QuickSave1");
Global.Config.SaveSlot = 1;
Config.SaveSlot = 1;
UpdateStatusSlots();
break;
case "Load State 2":
LoadQuickSave("QuickSave2");
Global.Config.SaveSlot = 2;
Config.SaveSlot = 2;
UpdateStatusSlots();
break;
case "Load State 3":
LoadQuickSave("QuickSave3");
Global.Config.SaveSlot = 3;
Config.SaveSlot = 3;
UpdateStatusSlots();
break;
case "Load State 4":
LoadQuickSave("QuickSave4");
Global.Config.SaveSlot = 4;
Config.SaveSlot = 4;
UpdateStatusSlots();
break;
case "Load State 5":
LoadQuickSave("QuickSave5");
Global.Config.SaveSlot = 5;
Config.SaveSlot = 5;
UpdateStatusSlots();
break;
case "Load State 6":
LoadQuickSave("QuickSave6");
Global.Config.SaveSlot = 6;
Config.SaveSlot = 6;
UpdateStatusSlots();
break;
case "Load State 7":
LoadQuickSave("QuickSave7");
Global.Config.SaveSlot = 7;
Config.SaveSlot = 7;
UpdateStatusSlots();
break;
case "Load State 8":
LoadQuickSave("QuickSave8");
Global.Config.SaveSlot = 8;
Config.SaveSlot = 8;
UpdateStatusSlots();
break;
case "Load State 9":
LoadQuickSave("QuickSave9");
Global.Config.SaveSlot = 9;
Config.SaveSlot = 9;
UpdateStatusSlots();
break;
@ -317,22 +317,22 @@ namespace BizHawk.Client.EmuHawk
// Tools
case "RAM Watch":
GlobalWin.Tools.LoadRamWatch(true);
Tools.LoadRamWatch(true);
break;
case "RAM Search":
GlobalWin.Tools.Load<RamSearch>();
Tools.Load<RamSearch>();
break;
case "Hex Editor":
GlobalWin.Tools.Load<HexEditor>();
Tools.Load<HexEditor>();
break;
case "Trace Logger":
GlobalWin.Tools.Load<TraceLogger>();
Tools.Load<TraceLogger>();
break;
case "Lua Console":
OpenLuaConsole();
break;
case "Cheats":
GlobalWin.Tools.Load<Cheats>();
Tools.Load<Cheats>();
break;
case "Toggle All Cheats":
if (Global.CheatList.Any())
@ -357,20 +357,20 @@ namespace BizHawk.Client.EmuHawk
break;
case "TAStudio":
GlobalWin.Tools.Load<TAStudio>();
Tools.Load<TAStudio>();
break;
case "ToolBox":
GlobalWin.Tools.Load<ToolBox>();
Tools.Load<ToolBox>();
break;
case "Virtual Pad":
GlobalWin.Tools.Load<VirtualpadTool>();
Tools.Load<VirtualpadTool>();
break;
// RAM Search
case "Do Search":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
if (Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.DoSearch();
Tools.RamSearch.DoSearch();
}
else
{
@ -379,9 +379,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "New Search":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
if (Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.NewSearch();
Tools.RamSearch.NewSearch();
}
else
{
@ -390,9 +390,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Previous Compare To":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
if (Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.NextCompareTo(reverse: true);
Tools.RamSearch.NextCompareTo(reverse: true);
}
else
{
@ -401,9 +401,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Next Compare To":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
if (Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.NextCompareTo();
Tools.RamSearch.NextCompareTo();
}
else
{
@ -412,9 +412,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Previous Operator":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
if (Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.NextOperator(reverse: true);
Tools.RamSearch.NextOperator(reverse: true);
}
else
{
@ -423,9 +423,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Next Operator":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
if (Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.NextOperator();
Tools.RamSearch.NextOperator();
}
else
{
@ -436,9 +436,9 @@ namespace BizHawk.Client.EmuHawk
// TAStudio
case "Add Branch":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AddBranchExternal();
Tools.TAStudio.AddBranchExternal();
}
else
{
@ -447,9 +447,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Delete Branch":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.RemoveBranchExternal();
Tools.TAStudio.RemoveBranchExternal();
}
else
{
@ -458,10 +458,10 @@ namespace BizHawk.Client.EmuHawk
break;
case "Show Cursor":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.SetVisibleIndex();
GlobalWin.Tools.TAStudio.RefreshDialog();
Tools.TAStudio.SetVisibleIndex();
Tools.TAStudio.RefreshDialog();
}
else
{
@ -470,9 +470,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Toggle Follow Cursor":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.TasPlaybackBox.FollowCursor ^= true;
Tools.TAStudio.TasPlaybackBox.FollowCursor ^= true;
}
else
{
@ -481,9 +481,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Toggle Auto-Restore":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.TasPlaybackBox.AutoRestore ^= true;
Tools.TAStudio.TasPlaybackBox.AutoRestore ^= true;
}
else
{
@ -492,9 +492,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Toggle Turbo Seek":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.TasPlaybackBox.TurboSeek ^= true;
Tools.TAStudio.TasPlaybackBox.TurboSeek ^= true;
}
else
{
@ -503,9 +503,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Undo":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.UndoExternal();
Tools.TAStudio.UndoExternal();
}
else
{
@ -514,9 +514,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Redo":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.RedoExternal();
Tools.TAStudio.RedoExternal();
}
else
{
@ -525,9 +525,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Select between Markers":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.SelectBetweenMarkersExternal();
Tools.TAStudio.SelectBetweenMarkersExternal();
}
else
{
@ -536,9 +536,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Select All":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.SelectAllExternal();
Tools.TAStudio.SelectAllExternal();
}
else
{
@ -547,9 +547,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Reselect Clip.":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.ReselectClipboardExternal();
Tools.TAStudio.ReselectClipboardExternal();
}
else
{
@ -558,9 +558,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Clear Frames":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.ClearFramesExternal();
Tools.TAStudio.ClearFramesExternal();
}
else
{
@ -569,9 +569,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Insert Frame":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.InsertFrameExternal();
Tools.TAStudio.InsertFrameExternal();
}
else
{
@ -580,9 +580,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Insert # Frames":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.InsertNumFramesExternal();
Tools.TAStudio.InsertNumFramesExternal();
}
else
{
@ -590,9 +590,9 @@ namespace BizHawk.Client.EmuHawk
}
break;
case "Delete Frames":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.DeleteFramesExternal();
Tools.TAStudio.DeleteFramesExternal();
}
else
{
@ -601,9 +601,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Clone Frames":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.CloneFramesExternal();
Tools.TAStudio.CloneFramesExternal();
}
else
{
@ -612,9 +612,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Analog Increment":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogIncrementByOne();
Tools.TAStudio.AnalogIncrementByOne();
}
else
{
@ -623,9 +623,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Analog Decrement":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogDecrementByOne();
Tools.TAStudio.AnalogDecrementByOne();
}
else
{
@ -634,9 +634,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Analog Incr. by 10":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogIncrementByTen();
Tools.TAStudio.AnalogIncrementByTen();
}
else
{
@ -645,9 +645,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Analog Decr. by 10":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogDecrementByTen();
Tools.TAStudio.AnalogDecrementByTen();
}
else
{
@ -656,9 +656,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Analog Maximum":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogMax();
Tools.TAStudio.AnalogMax();
}
else
{
@ -667,9 +667,9 @@ namespace BizHawk.Client.EmuHawk
break;
case "Analog Minimum":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogMin();
Tools.TAStudio.AnalogMin();
}
else
{
@ -728,28 +728,28 @@ namespace BizHawk.Client.EmuHawk
// Analog
case "Y Up Small":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(null, Global.Config.Analog_SmallChange);
Tools.VirtualPad.BumpAnalogValue(null, Config.Analog_SmallChange);
break;
case "Y Up Large":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(null, Global.Config.Analog_LargeChange);
Tools.VirtualPad.BumpAnalogValue(null, Config.Analog_LargeChange);
break;
case "Y Down Small":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(null, -Global.Config.Analog_SmallChange);
Tools.VirtualPad.BumpAnalogValue(null, -Config.Analog_SmallChange);
break;
case "Y Down Large":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(null, -Global.Config.Analog_LargeChange);
Tools.VirtualPad.BumpAnalogValue(null, -Config.Analog_LargeChange);
break;
case "X Up Small":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(Global.Config.Analog_SmallChange, null);
Tools.VirtualPad.BumpAnalogValue(Config.Analog_SmallChange, null);
break;
case "X Up Large":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(Global.Config.Analog_LargeChange, null);
Tools.VirtualPad.BumpAnalogValue(Config.Analog_LargeChange, null);
break;
case "X Down Small":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(-Global.Config.Analog_SmallChange, null);
Tools.VirtualPad.BumpAnalogValue(-Config.Analog_SmallChange, null);
break;
case "X Down Large":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(-Global.Config.Analog_LargeChange, null);
Tools.VirtualPad.BumpAnalogValue(-Config.Analog_LargeChange, null);
break;
}

10
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -34,23 +34,23 @@ namespace BizHawk.Client.EmuHawk
if (Global.MovieSession.PreviousNES_InQuickNES.HasValue)
{
Global.Config.NES_InQuickNES = Global.MovieSession.PreviousNES_InQuickNES.Value;
Config.NES_InQuickNES = Global.MovieSession.PreviousNES_InQuickNES.Value;
Global.MovieSession.PreviousNES_InQuickNES = null;
}
if (Global.MovieSession.PreviousSNES_InSnes9x.HasValue)
{
Global.Config.SNES_InSnes9x = Global.MovieSession.PreviousSNES_InSnes9x.Value;
Config.SNES_InSnes9x = Global.MovieSession.PreviousSNES_InSnes9x.Value;
Global.MovieSession.PreviousSNES_InSnes9x = null;
}
if (Global.MovieSession.PreviousGBA_UsemGBA.HasValue)
{
Global.Config.GBA_UsemGBA = Global.MovieSession.PreviousGBA_UsemGBA.Value;
Config.GBA_UsemGBA = Global.MovieSession.PreviousGBA_UsemGBA.Value;
Global.MovieSession.PreviousGBA_UsemGBA = null;
}
Global.Config.RecentMovies.Add(movie.Filename);
Config.RecentMovies.Add(movie.Filename);
if (Emulator.HasSavestates() && movie.StartsFromSavestate)
{
@ -85,7 +85,7 @@ namespace BizHawk.Client.EmuHawk
SetMainformMovieInfo();
GlobalWin.Tools.Restart<VirtualpadTool>();
Tools.Restart<VirtualpadTool>();
if (Global.MovieSession.Movie.Hash != Global.Game.Hash)

451
BizHawk.Client.EmuHawk/MainForm.cs
View File

File diff suppressed because it is too large Load Diff