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

rename GlobalWinF to GlobalWin, yeah, I'm being nitpicky

This commit is contained in:
adelikat 2013-11-03 16:07:58 +00:00
parent 26ffd9f4e3
commit 589758f74d
54 changed files with 595 additions and 595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,19 +394,19 @@ namespace BizHawk.Client.EmuHawk
public void AddMessage(string message) public void AddMessage(string message)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
messages.Add(new UIMessage { Message = message, ExpireAt = DateTime.Now + TimeSpan.FromSeconds(2) }); messages.Add(new UIMessage { Message = message, ExpireAt = DateTime.Now + TimeSpan.FromSeconds(2) });
} }
public void AddGUIText(string message, int x, int y, bool alert, Color BackGround, Color ForeColor, int anchor) public void AddGUIText(string message, int x, int y, bool alert, Color BackGround, Color ForeColor, int anchor)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
GUITextList.Add(new UIDisplay { Message = message, X = x, Y = y, BackGround = BackGround, ForeColor = ForeColor, Alert = alert, Anchor = anchor }); GUITextList.Add(new UIDisplay { Message = message, X = x, Y = y, BackGround = BackGround, ForeColor = ForeColor, Alert = alert, Anchor = anchor });
} }
public void ClearGUIText() public void ClearGUIText()
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
GUITextList.Clear(); GUITextList.Clear();
} }
@ -414,7 +414,7 @@ namespace BizHawk.Client.EmuHawk
public void DrawMessages(IBlitter g) public void DrawMessages(IBlitter g)
{ {
if (!GlobalWinF.ClientControls["MaxTurbo"]) if (!GlobalWin.ClientControls["MaxTurbo"])
{ {
messages.RemoveAll(m => DateTime.Now > m.ExpireAt); messages.RemoveAll(m => DateTime.Now > m.ExpireAt);
int line = 1; int line = 1;
@ -587,7 +587,7 @@ namespace BizHawk.Client.EmuHawk
g.DrawString(rerec, MessageFont, FixedMessagesColor, x, y); g.DrawString(rerec, MessageFont, FixedMessagesColor, x, y);
} }
if (GlobalWinF.ClientControls["Autohold"] || GlobalWinF.ClientControls["Autofire"]) if (GlobalWin.ClientControls["Autohold"] || GlobalWin.ClientControls["Autofire"])
{ {
StringBuilder disp = new StringBuilder("Held: "); StringBuilder disp = new StringBuilder("Held: ");
@ -597,7 +597,7 @@ namespace BizHawk.Client.EmuHawk
disp.Append(' '); disp.Append(' ');
} }
foreach (string s in GlobalWinF.AutofireStickyXORAdapter.CurrentStickies) foreach (string s in GlobalWin.AutofireStickyXORAdapter.CurrentStickies)
{ {
disp.Append("Auto-"); disp.Append("Auto-");
disp.Append(s); disp.Append(s);
@ -659,7 +659,7 @@ namespace BizHawk.Client.EmuHawk
/// <summary>update Global.RenderPanel from the passed IVideoProvider</summary> /// <summary>update Global.RenderPanel from the passed IVideoProvider</summary>
public void UpdateSource(IVideoProvider videoProvider) public void UpdateSource(IVideoProvider videoProvider)
{ {
UpdateSourceEx(videoProvider, GlobalWinF.RenderPanel); UpdateSourceEx(videoProvider, GlobalWin.RenderPanel);
} }
/// <summary> /// <summary>
@ -772,10 +772,10 @@ namespace BizHawk.Client.EmuHawk
void RenderOSD(IBlitter renderPanel) void RenderOSD(IBlitter renderPanel)
{ {
GlobalWinF.OSD.Begin(renderPanel); GlobalWin.OSD.Begin(renderPanel);
renderPanel.Open(); renderPanel.Open();
GlobalWinF.OSD.DrawScreenInfo(renderPanel); GlobalWin.OSD.DrawScreenInfo(renderPanel);
GlobalWinF.OSD.DrawMessages(renderPanel); GlobalWin.OSD.DrawMessages(renderPanel);
renderPanel.Close(); renderPanel.Close();
} }

2
BizHawk.Client.EmuHawk/GlobalWinF.cs → BizHawk.Client.EmuHawk/GlobalWin.cs
View File

@ -5,7 +5,7 @@ using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
public static class GlobalWinF public static class GlobalWin
{ {
public static MainForm MainForm; public static MainForm MainForm;
public static ToolManager Tools; public static ToolManager Tools;

2
BizHawk.Client.EmuHawk/Input/GamePad.cs
View File

@ -27,7 +27,7 @@ namespace BizHawk.Client.EmuHawk
continue; // Don't input XBOX 360 controllers into here; we'll process them via XInput (there are limitations in some trigger axes when xbox pads go over xinput) continue; // Don't input XBOX 360 controllers into here; we'll process them via XInput (there are limitations in some trigger axes when xbox pads go over xinput)
var joystick = new Joystick(dinput, device.InstanceGuid); var joystick = new Joystick(dinput, device.InstanceGuid);
joystick.SetCooperativeLevel(GlobalWinF.MainForm.Handle, CooperativeLevel.Background | CooperativeLevel.Nonexclusive); joystick.SetCooperativeLevel(GlobalWin.MainForm.Handle, CooperativeLevel.Background | CooperativeLevel.Nonexclusive);
foreach (DeviceObjectInstance deviceObject in joystick.GetObjects()) foreach (DeviceObjectInstance deviceObject in joystick.GetObjects())
{ {
if ((deviceObject.ObjectType & ObjectDeviceType.Axis) != 0) if ((deviceObject.ObjectType & ObjectDeviceType.Axis) != 0)

4
BizHawk.Client.EmuHawk/Input/Input.cs
View File

@ -339,7 +339,7 @@ namespace BizHawk.Client.EmuHawk
} }
bool swallow = !GlobalWinF.MainForm.AllowInput; bool swallow = !GlobalWin.MainForm.AllowInput;
foreach (var ie in _NewEvents) foreach (var ie in _NewEvents)
{ {
@ -401,7 +401,7 @@ namespace BizHawk.Client.EmuHawk
lock (this) lock (this)
{ {
if (InputEvents.Count == 0) return null; if (InputEvents.Count == 0) return null;
if (!GlobalWinF.MainForm.AllowInput) return null; if (!GlobalWin.MainForm.AllowInput) return null;
//we only listen to releases for input binding, because we need to distinguish releases of pure modifierkeys from modified keys //we only listen to releases for input binding, because we need to distinguish releases of pure modifierkeys from modified keys
//if you just pressed ctrl, wanting to bind ctrl, we'd see: pressed:ctrl, unpressed:ctrl //if you just pressed ctrl, wanting to bind ctrl, we'd see: pressed:ctrl, unpressed:ctrl

2
BizHawk.Client.EmuHawk/Input/Keyboard.cs
View File

@ -16,7 +16,7 @@ namespace BizHawk.Client.EmuHawk
if (keyboard == null || keyboard.Disposed) if (keyboard == null || keyboard.Disposed)
keyboard = new Keyboard(dinput); keyboard = new Keyboard(dinput);
keyboard.SetCooperativeLevel(GlobalWinF.MainForm.Handle, CooperativeLevel.Background | CooperativeLevel.Nonexclusive); keyboard.SetCooperativeLevel(GlobalWin.MainForm.Handle, CooperativeLevel.Background | CooperativeLevel.Nonexclusive);
} }
public static void Update() public static void Update()

2
BizHawk.Client.EmuHawk/LogWindow.cs
View File

@ -20,7 +20,7 @@ namespace BizHawk.Client.EmuHawk
Closing += (o, e) => Closing += (o, e) =>
{ {
Global.Config.ShowLogWindow = false; Global.Config.ShowLogWindow = false;
GlobalWinF.MainForm.NotifyLogWindowClosing(); GlobalWin.MainForm.NotifyLogWindowClosing();
LogConsole.notifyLogWindowClosing(); LogConsole.notifyLogWindowClosing();
SaveConfigSettings(); SaveConfigSettings();
}; };

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

@ -411,9 +411,9 @@ namespace BizHawk.Client.EmuHawk
RestoreDirectory = false RestoreDirectory = false
}; };
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = ofd.ShowDialog(); var result = ofd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
{ {
return; return;
@ -483,9 +483,9 @@ namespace BizHawk.Client.EmuHawk
Filter = "PNG File (*.png)|*.png" Filter = "PNG File (*.png)|*.png"
}; };
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
TakeScreenshot(sfd.FileName); TakeScreenshot(sfd.FileName);
@ -504,7 +504,7 @@ namespace BizHawk.Client.EmuHawk
private void ExitMenuItem_Click(object sender, EventArgs e) private void ExitMenuItem_Click(object sender, EventArgs e)
{ {
if (GlobalWinF.Tools.AskSave()) if (GlobalWin.Tools.AskSave())
{ {
Close(); Close();
} }
@ -643,37 +643,37 @@ namespace BizHawk.Client.EmuHawk
private void DisplayFPSMenuItem_Click(object sender, EventArgs e) private void DisplayFPSMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
ToggleFPS(); ToggleFPS();
} }
private void DisplayFrameCounterMenuItem_Click(object sender, EventArgs e) private void DisplayFrameCounterMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
ToggleFrameCounter(); ToggleFrameCounter();
} }
private void DisplayLagCounterMenuItem_Click(object sender, EventArgs e) private void DisplayLagCounterMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
ToggleLagCounter(); ToggleLagCounter();
} }
private void DisplayInputMenuItem_Click(object sender, EventArgs e) private void DisplayInputMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
ToggleInputDisplay(); ToggleInputDisplay();
} }
private void DisplayRerecordsMenuItem_Click(object sender, EventArgs e) private void DisplayRerecordsMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
Global.Config.DisplayRerecordCount ^= true; Global.Config.DisplayRerecordCount ^= true;
} }
private void DisplaySubtitlesMenuItem_Click(object sender, EventArgs e) private void DisplaySubtitlesMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
Global.Config.DisplaySubtitles ^= true; Global.Config.DisplaySubtitles ^= true;
} }
@ -868,11 +868,11 @@ namespace BizHawk.Client.EmuHawk
Global.Config.ShowContextMenu ^= true; Global.Config.ShowContextMenu ^= true;
if (Global.Config.ShowContextMenu) if (Global.Config.ShowContextMenu)
{ {
GlobalWinF.OSD.AddMessage("Context menu enabled"); GlobalWin.OSD.AddMessage("Context menu enabled");
} }
else else
{ {
GlobalWinF.OSD.AddMessage("Context menu disabled"); GlobalWin.OSD.AddMessage("Context menu disabled");
} }
} }
@ -881,11 +881,11 @@ namespace BizHawk.Client.EmuHawk
Global.Config.BackupSavestates ^= true; Global.Config.BackupSavestates ^= true;
if (Global.Config.BackupSavestates) if (Global.Config.BackupSavestates)
{ {
GlobalWinF.OSD.AddMessage("Backup savestates enabled"); GlobalWin.OSD.AddMessage("Backup savestates enabled");
} }
else else
{ {
GlobalWinF.OSD.AddMessage("Backup savestates disabled"); GlobalWin.OSD.AddMessage("Backup savestates disabled");
} }
} }
@ -894,11 +894,11 @@ namespace BizHawk.Client.EmuHawk
Global.Config.AutoSavestates ^= true; Global.Config.AutoSavestates ^= true;
if (Global.Config.AutoSavestates) if (Global.Config.AutoSavestates)
{ {
GlobalWinF.OSD.AddMessage("AutoSavestates enabled"); GlobalWin.OSD.AddMessage("AutoSavestates enabled");
} }
else else
{ {
GlobalWinF.OSD.AddMessage("AutoSavestates disabled"); GlobalWin.OSD.AddMessage("AutoSavestates disabled");
} }
} }
@ -907,11 +907,11 @@ namespace BizHawk.Client.EmuHawk
Global.Config.SaveScreenshotWithStates ^= true; Global.Config.SaveScreenshotWithStates ^= true;
if (Global.Config.SaveScreenshotWithStates) if (Global.Config.SaveScreenshotWithStates)
{ {
GlobalWinF.OSD.AddMessage("Screenshots will be saved in savestates"); GlobalWin.OSD.AddMessage("Screenshots will be saved in savestates");
} }
else else
{ {
GlobalWinF.OSD.AddMessage("Screenshots will not be saved in savestates"); GlobalWin.OSD.AddMessage("Screenshots will not be saved in savestates");
} }
} }
@ -925,11 +925,11 @@ namespace BizHawk.Client.EmuHawk
Global.Config.BackupSaveram ^= true; Global.Config.BackupSaveram ^= true;
if (Global.Config.BackupSaveram) if (Global.Config.BackupSaveram)
{ {
GlobalWinF.OSD.AddMessage("Backup saveram enabled"); GlobalWin.OSD.AddMessage("Backup saveram enabled");
} }
else else
{ {
GlobalWinF.OSD.AddMessage("Backup saveram disabled"); GlobalWin.OSD.AddMessage("Backup saveram disabled");
} }
} }
@ -1010,7 +1010,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.VSyncThrottle = false; Global.Config.VSyncThrottle = false;
if (old) if (old)
{ {
GlobalWinF.RenderPanel.Resized = true; GlobalWin.RenderPanel.Resized = true;
} }
} }
LimitFrameRateMessage(); LimitFrameRateMessage();
@ -1027,7 +1027,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.VSyncThrottle = false; Global.Config.VSyncThrottle = false;
if (old) if (old)
{ {
GlobalWinF.RenderPanel.Resized = true; GlobalWin.RenderPanel.Resized = true;
} }
} }
} }
@ -1035,7 +1035,7 @@ namespace BizHawk.Client.EmuHawk
private void VsyncThrottleMenuItem_Click(object sender, EventArgs e) private void VsyncThrottleMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config.VSyncThrottle ^= true; Global.Config.VSyncThrottle ^= true;
GlobalWinF.RenderPanel.Resized = true; GlobalWin.RenderPanel.Resized = true;
if (Global.Config.VSyncThrottle) if (Global.Config.VSyncThrottle)
{ {
Global.Config.ClockThrottle = false; Global.Config.ClockThrottle = false;
@ -1054,7 +1054,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.VSync ^= true; Global.Config.VSync ^= true;
if (!Global.Config.VSyncThrottle) // when vsync throttle is on, vsync is forced to on, so no change to make here if (!Global.Config.VSyncThrottle) // when vsync throttle is on, vsync is forced to on, so no change to make here
{ {
GlobalWinF.RenderPanel.Resized = true; GlobalWin.RenderPanel.Resized = true;
} }
} }
@ -1117,14 +1117,14 @@ namespace BizHawk.Client.EmuHawk
private void SaveConfigMenuItem_Click(object sender, EventArgs e) private void SaveConfigMenuItem_Click(object sender, EventArgs e)
{ {
SaveConfig(); SaveConfig();
GlobalWinF.OSD.AddMessage("Saved settings"); GlobalWin.OSD.AddMessage("Saved settings");
} }
private void LoadConfigMenuItem_Click(object sender, EventArgs e) private void LoadConfigMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config = ConfigService.Load(PathManager.DefaultIniPath, Global.Config); Global.Config = ConfigService.Load(PathManager.DefaultIniPath, Global.Config);
Global.Config.ResolveDefaults(); Global.Config.ResolveDefaults();
GlobalWinF.OSD.AddMessage("Config file loaded"); GlobalWin.OSD.AddMessage("Config file loaded");
} }
#endregion #endregion
@ -1148,7 +1148,7 @@ namespace BizHawk.Client.EmuHawk
private void ToolBoxMenuItem_Click(object sender, EventArgs e) private void ToolBoxMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<ToolBox>(); GlobalWin.Tools.Load<ToolBox>();
} }
private void RamWatchMenuItem_Click(object sender, EventArgs e) private void RamWatchMenuItem_Click(object sender, EventArgs e)
@ -1158,12 +1158,12 @@ namespace BizHawk.Client.EmuHawk
private void RamSearchMenuItem_Click(object sender, EventArgs e) private void RamSearchMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<RamSearch>(); GlobalWin.Tools.Load<RamSearch>();
} }
private void HexEditorMenuItem_Click(object sender, EventArgs e) private void HexEditorMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<HexEditor>(); GlobalWin.Tools.Load<HexEditor>();
} }
private void TraceLoggerMenuItem_Click(object sender, EventArgs e) private void TraceLoggerMenuItem_Click(object sender, EventArgs e)
@ -1178,12 +1178,12 @@ namespace BizHawk.Client.EmuHawk
private void VirtualPadMenuItem_Click(object sender, EventArgs e) private void VirtualPadMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<VirtualPadForm>(); GlobalWin.Tools.Load<VirtualPadForm>();
} }
private void CheatsMenuItem_Click(object sender, EventArgs e) private void CheatsMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<Cheats>(); GlobalWin.Tools.Load<Cheats>();
} }
private void LuaConsoleMenuItem_Click(object sender, EventArgs e) private void LuaConsoleMenuItem_Click(object sender, EventArgs e)
@ -1193,12 +1193,12 @@ namespace BizHawk.Client.EmuHawk
private void CreateDualGbXmlMenuItem_Click(object sender, EventArgs e) private void CreateDualGbXmlMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
using (var dlg = new GBtools.DualGBXMLCreator()) using (var dlg = new GBtools.DualGBXMLCreator())
{ {
dlg.ShowDialog(this); dlg.ShowDialog(this);
} }
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
} }
#endregion #endregion
@ -1207,17 +1207,17 @@ namespace BizHawk.Client.EmuHawk
private void NESDebuggerMenuItem_Click(object sender, EventArgs e) private void NESDebuggerMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<NESDebugger>(); GlobalWin.Tools.Load<NESDebugger>();
} }
private void NESPPUViewerMenuItem_Click(object sender, EventArgs e) private void NESPPUViewerMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<NESPPU>(); GlobalWin.Tools.Load<NESPPU>();
} }
private void NESNametableViewerMenuItem_Click(object sender, EventArgs e) private void NESNametableViewerMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<NESNameTableViewer>(); GlobalWin.Tools.Load<NESNameTableViewer>();
} }
private void NESGameGenieCodesMenuItem_Click(object sender, EventArgs e) private void NESGameGenieCodesMenuItem_Click(object sender, EventArgs e)
@ -1233,7 +1233,7 @@ namespace BizHawk.Client.EmuHawk
private void NESSoundChannelsMenuItem_Click(object sender, EventArgs e) private void NESSoundChannelsMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<NESSoundConfig>(); GlobalWin.Tools.Load<NESSoundConfig>();
} }
#endregion #endregion
@ -1249,7 +1249,7 @@ namespace BizHawk.Client.EmuHawk
private void PCEBGViewerMenuItem_Click(object sender, EventArgs e) private void PCEBGViewerMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<PCEBGViewer>(); GlobalWin.Tools.Load<PCEBGViewer>();
} }
private void PCEAlwaysPerformSpriteLimitMenuItem_Click(object sender, EventArgs e) private void PCEAlwaysPerformSpriteLimitMenuItem_Click(object sender, EventArgs e)
@ -1360,7 +1360,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Global.Emulator is TI83) if (Global.Emulator is TI83)
{ {
GlobalWinF.Tools.Load<TI83KeyPad>(); GlobalWin.Tools.Load<TI83KeyPad>();
} }
} }
@ -1421,11 +1421,11 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.Atari2600_BW) if (Global.Config.Atari2600_BW)
{ {
GlobalWinF.OSD.AddMessage("Setting the Black and White Switch to On"); GlobalWin.OSD.AddMessage("Setting the Black and White Switch to On");
} }
else else
{ {
GlobalWinF.OSD.AddMessage("Setting the Black and White Switch to Off"); GlobalWin.OSD.AddMessage("Setting the Black and White Switch to Off");
} }
} }
@ -1440,11 +1440,11 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.Atari2600_LeftDifficulty) if (Global.Config.Atari2600_LeftDifficulty)
{ {
GlobalWinF.OSD.AddMessage("Setting Left Difficulty to B"); GlobalWin.OSD.AddMessage("Setting Left Difficulty to B");
} }
else else
{ {
GlobalWinF.OSD.AddMessage("Setting Left Difficulty to A"); GlobalWin.OSD.AddMessage("Setting Left Difficulty to A");
} }
} }
@ -1459,11 +1459,11 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.Atari2600_RightDifficulty) if (Global.Config.Atari2600_RightDifficulty)
{ {
GlobalWinF.OSD.AddMessage("Setting Right Difficulty to B"); GlobalWin.OSD.AddMessage("Setting Right Difficulty to B");
} }
else else
{ {
GlobalWinF.OSD.AddMessage("Setting Right Difficulty to A"); GlobalWin.OSD.AddMessage("Setting Right Difficulty to A");
} }
} }
@ -1565,7 +1565,7 @@ namespace BizHawk.Client.EmuHawk
private void GBGPUViewerMenuItem_Click(object sender, EventArgs e) private void GBGPUViewerMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<GBGPUView>(); GlobalWin.Tools.Load<GBGPUView>();
} }
private void GBGameGenieMenuItem_Click(object sender, EventArgs e) private void GBGameGenieMenuItem_Click(object sender, EventArgs e)
@ -1579,7 +1579,7 @@ namespace BizHawk.Client.EmuHawk
private void GbaGpuViewerMenuItem_Click(object sender, EventArgs e) private void GbaGpuViewerMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<GBAGPUView>(); GlobalWin.Tools.Load<GBAGPUView>();
} }
#endregion #endregion
@ -1664,7 +1664,7 @@ namespace BizHawk.Client.EmuHawk
private void SnesGfxDebuggerMenuItem_Click(object sender, EventArgs e) private void SnesGfxDebuggerMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<SNESGraphicsDebugger>(); GlobalWin.Tools.Load<SNESGraphicsDebugger>();
} }
private void SnesGBInSGBMenuItem_Click(object sender, EventArgs e) private void SnesGBInSGBMenuItem_Click(object sender, EventArgs e)
@ -1722,11 +1722,11 @@ namespace BizHawk.Client.EmuHawk
{ {
if (new N64VideoPluginconfig().ShowDialog() == DialogResult.OK) if (new N64VideoPluginconfig().ShowDialog() == DialogResult.OK)
{ {
GlobalWinF.OSD.AddMessage("Plugin settings saved"); GlobalWin.OSD.AddMessage("Plugin settings saved");
} }
else else
{ {
GlobalWinF.OSD.AddMessage("Plugin settings aborted"); GlobalWin.OSD.AddMessage("Plugin settings aborted");
} }
} }
@ -1899,7 +1899,7 @@ namespace BizHawk.Client.EmuHawk
private void BackupMovieContextMenuItem_Click(object sender, EventArgs e) private void BackupMovieContextMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.OSD.AddMessage("Backup movie saved."); GlobalWin.OSD.AddMessage("Backup movie saved.");
Global.MovieSession.Movie.WriteBackup(); Global.MovieSession.Movie.WriteBackup();
} }
@ -1967,7 +1967,7 @@ namespace BizHawk.Client.EmuHawk
".State" ".State"
); );
GlobalWinF.OSD.AddMessage("Save slot " + Global.Config.SaveSlot + " restored."); GlobalWin.OSD.AddMessage("Save slot " + Global.Config.SaveSlot + " restored.");
} }
private void ClearSRAMContextMenuItem_Click(object sender, EventArgs e) private void ClearSRAMContextMenuItem_Click(object sender, EventArgs e)
@ -1989,9 +1989,9 @@ namespace BizHawk.Client.EmuHawk
string details = Global.Emulator.CoreComm.RomStatusDetails; string details = Global.Emulator.CoreComm.RomStatusDetails;
if (!String.IsNullOrEmpty(details)) if (!String.IsNullOrEmpty(details))
{ {
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
LogWindow.ShowReport("Dump Status Report", details, this); LogWindow.ShowReport("Dump Status Report", details, this);
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
} }
} }
@ -2044,7 +2044,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (CheatStatusButton.Visible) if (CheatStatusButton.Visible)
{ {
GlobalWinF.Tools.Load<Cheats>(); GlobalWin.Tools.Load<Cheats>();
} }
} }
@ -2078,7 +2078,7 @@ namespace BizHawk.Client.EmuHawk
private void MainForm_Enter(object sender, EventArgs e) private void MainForm_Enter(object sender, EventArgs e)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
} }
public void MainForm_MouseClick(object sender, MouseEventArgs e) public void MainForm_MouseClick(object sender, MouseEventArgs e)
@ -2093,7 +2093,7 @@ namespace BizHawk.Client.EmuHawk
private void MainForm_Resize(object sender, EventArgs e) private void MainForm_Resize(object sender, EventArgs e)
{ {
GlobalWinF.RenderPanel.Resized = true; GlobalWin.RenderPanel.Resized = true;
} }
private void MainForm_Shown(object sender, EventArgs e) private void MainForm_Shown(object sender, EventArgs e)
@ -2109,7 +2109,7 @@ namespace BizHawk.Client.EmuHawk
private void MainformMenu_Leave(object sender, EventArgs e) private void MainformMenu_Leave(object sender, EventArgs e)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
} }
private void MainformMenu_MenuActivate(object sender, EventArgs e) private void MainformMenu_MenuActivate(object sender, EventArgs e)
@ -2125,7 +2125,7 @@ namespace BizHawk.Client.EmuHawk
private void MainformMenu_MenuDeactivate(object sender, EventArgs e) private void MainformMenu_MenuDeactivate(object sender, EventArgs e)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
if (!wasPaused) if (!wasPaused)
{ {
UnpauseEmulator(); UnpauseEmulator();
@ -2147,9 +2147,9 @@ namespace BizHawk.Client.EmuHawk
if (extension != null && extension.ToUpper() == ".LUA") if (extension != null && extension.ToUpper() == ".LUA")
{ {
OpenLuaConsole(); OpenLuaConsole();
if (GlobalWinF.Tools.Has<LuaConsole>()) if (GlobalWin.Tools.Has<LuaConsole>())
{ {
GlobalWinF.Tools.LuaConsole.LoadLuaFile(path); GlobalWin.Tools.LuaConsole.LoadLuaFile(path);
} }
isLua = true; isLua = true;
} }
@ -2163,14 +2163,14 @@ namespace BizHawk.Client.EmuHawk
if (ext.ToUpper() == ".LUASES") if (ext.ToUpper() == ".LUASES")
{ {
OpenLuaConsole(); OpenLuaConsole();
if (GlobalWinF.Tools.Has<LuaConsole>()) if (GlobalWin.Tools.Has<LuaConsole>())
{ {
GlobalWinF.Tools.LuaConsole.LoadLuaSession(filePaths[0]); GlobalWin.Tools.LuaConsole.LoadLuaSession(filePaths[0]);
} }
} }
else if (IsValidMovieExtension(ext)) else if (IsValidMovieExtension(ext))
{ {
StartNewMovie(new Movie(filePaths[0], GlobalWinF.MainForm.GetEmuVersion()), false); StartNewMovie(new Movie(filePaths[0], GlobalWin.MainForm.GetEmuVersion()), false);
} }
else if (ext.ToUpper() == ".STATE") else if (ext.ToUpper() == ".STATE")
{ {
@ -2179,13 +2179,13 @@ namespace BizHawk.Client.EmuHawk
else if (ext.ToUpper() == ".CHT") else if (ext.ToUpper() == ".CHT")
{ {
Global.CheatList.Load(filePaths[0], false); Global.CheatList.Load(filePaths[0], false);
GlobalWinF.Tools.Load<Cheats>(); GlobalWin.Tools.Load<Cheats>();
ToolHelpers.UpdateCheatRelatedTools(); ToolHelpers.UpdateCheatRelatedTools();
} }
else if (ext.ToUpper() == ".WCH") else if (ext.ToUpper() == ".WCH")
{ {
LoadRamWatch(true); LoadRamWatch(true);
(GlobalWinF.Tools.Get<RamWatch>() as RamWatch).LoadWatchFile(new FileInfo(filePaths[0]), false); (GlobalWin.Tools.Get<RamWatch>() as RamWatch).LoadWatchFile(new FileInfo(filePaths[0]), false);
} }
else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0]))) else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0])))
@ -2202,7 +2202,7 @@ namespace BizHawk.Client.EmuHawk
string errorMsg; string errorMsg;
string warningMsg; string warningMsg;
Movie movie = MovieImport.ImportFile(filePaths[0], GlobalWinF.MainForm.GetEmuVersion(), out errorMsg, out warningMsg); Movie movie = MovieImport.ImportFile(filePaths[0], GlobalWin.MainForm.GetEmuVersion(), out errorMsg, out warningMsg);
if (errorMsg.Length > 0) if (errorMsg.Length > 0)
{ {
MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
@ -2216,7 +2216,7 @@ namespace BizHawk.Client.EmuHawk
movie.WriteMovie(); movie.WriteMovie();
StartNewMovie(movie, false); StartNewMovie(movie, false);
} }
GlobalWinF.OSD.AddMessage(warningMsg); GlobalWin.OSD.AddMessage(warningMsg);
} }
else else
{ {

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

@ -19,7 +19,7 @@ namespace BizHawk.Client.EmuHawk
Global.MovieSession = new MovieSession Global.MovieSession = new MovieSession
{ {
Movie = m, Movie = m,
MessageCallback = GlobalWinF.OSD.AddMessage, MessageCallback = GlobalWin.OSD.AddMessage,
AskYesNoCallback = StateErrorAskUser AskYesNoCallback = StateErrorAskUser
}; };
@ -31,7 +31,7 @@ namespace BizHawk.Client.EmuHawk
SetSyncDependentSettings(); SetSyncDependentSettings();
} }
LoadRom(GlobalWinF.MainForm.CurrentlyOpenRom, true, !record); LoadRom(GlobalWin.MainForm.CurrentlyOpenRom, true, !record);
Global.Config.RecentMovies.Add(m.Filename); Global.Config.RecentMovies.Add(m.Filename);
if (Global.MovieSession.Movie.StartsFromSavestate) if (Global.MovieSession.Movie.StartsFromSavestate)
@ -51,9 +51,9 @@ namespace BizHawk.Client.EmuHawk
Global.MovieSession.Movie.StartPlayback(); Global.MovieSession.Movie.StartPlayback();
} }
SetMainformMovieInfo(); SetMainformMovieInfo();
GlobalWinF.Tools.Restart<TAStudio>(); GlobalWin.Tools.Restart<TAStudio>();
GlobalWinF.Tools.Restart<VirtualPadForm>(); GlobalWin.Tools.Restart<VirtualPadForm>();
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
} }
public void SetMainformMovieInfo() public void SetMainformMovieInfo()
@ -117,7 +117,7 @@ namespace BizHawk.Client.EmuHawk
Global.Emulator.ClearSaveRam(); Global.Emulator.ClearSaveRam();
Global.MovieSession.Movie.StartPlayback(); Global.MovieSession.Movie.StartPlayback();
SetMainformMovieInfo(); SetMainformMovieInfo();
GlobalWinF.OSD.AddMessage("Replaying movie file in read-only mode"); GlobalWin.OSD.AddMessage("Replaying movie file in read-only mode");
Global.ReadOnly = true; Global.ReadOnly = true;
} }
} }

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

@ -401,12 +401,12 @@ namespace BizHawk.Client.EmuHawk
{ {
if (RewindActive != enabled) if (RewindActive != enabled)
{ {
GlobalWinF.OSD.AddMessage("Rewind " + (enabled ? "Enabled" : "Disabled")); GlobalWin.OSD.AddMessage("Rewind " + (enabled ? "Enabled" : "Disabled"));
} }
if (RewindFrequency != frequency && enabled) if (RewindFrequency != frequency && enabled)
{ {
GlobalWinF.OSD.AddMessage("Rewind frequency set to " + frequency); GlobalWin.OSD.AddMessage("Rewind frequency set to " + frequency);
} }
RewindActive = enabled; RewindActive = enabled;

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

File diff suppressed because it is too large Load Diff

12
BizHawk.Client.EmuHawk/Program.cs
View File

@ -72,13 +72,13 @@ namespace BizHawk.Client.EmuHawk
BizHawk.Common.HawkFile.ArchiveHandlerFactory = new SevenZipSharpArchiveHandler(); BizHawk.Common.HawkFile.ArchiveHandlerFactory = new SevenZipSharpArchiveHandler();
#if WINDOWS #if WINDOWS
try { GlobalWinF.DSound = SoundEnumeration.Create(); } try { GlobalWin.DSound = SoundEnumeration.Create(); }
catch catch
{ {
MessageBox.Show("Couldn't initialize DirectSound! Things may go poorly for you. Try changing your sound driver to 41khz instead of 48khz in mmsys.cpl.", "Initialization Error", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Couldn't initialize DirectSound! Things may go poorly for you. Try changing your sound driver to 41khz instead of 48khz in mmsys.cpl.", "Initialization Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
} }
try { GlobalWinF.Direct3D = new Direct3D(); } try { GlobalWin.Direct3D = new Direct3D(); }
catch catch
{ {
//fallback to GDI rendering //fallback to GDI rendering
@ -127,10 +127,10 @@ namespace BizHawk.Client.EmuHawk
#if WINDOWS #if WINDOWS
finally finally
{ {
if (GlobalWinF.DSound != null && GlobalWinF.DSound.Disposed == false) if (GlobalWin.DSound != null && GlobalWin.DSound.Disposed == false)
GlobalWinF.DSound.Dispose(); GlobalWin.DSound.Dispose();
if (GlobalWinF.Direct3D != null && GlobalWinF.Direct3D.Disposed == false) if (GlobalWin.Direct3D != null && GlobalWin.Direct3D.Disposed == false)
GlobalWinF.Direct3D.Dispose(); GlobalWin.Direct3D.Dispose();
GamePad.CloseAll(); GamePad.CloseAll();
} }
#endif #endif

8
BizHawk.Client.EmuHawk/RenderPanel.cs
View File

@ -347,13 +347,13 @@ namespace BizHawk.Client.EmuHawk
d3d = direct3D; d3d = direct3D;
backingControl = control; backingControl = control;
control.MouseDoubleClick += (o, e) => HandleFullscreenToggle(o, e); control.MouseDoubleClick += (o, e) => HandleFullscreenToggle(o, e);
control.MouseClick += (o, e) => GlobalWinF.MainForm.MainForm_MouseClick(o, e); control.MouseClick += (o, e) => GlobalWin.MainForm.MainForm_MouseClick(o, e);
} }
private void HandleFullscreenToggle(object sender, MouseEventArgs e) private void HandleFullscreenToggle(object sender, MouseEventArgs e)
{ {
if (e.Button == MouseButtons.Left) if (e.Button == MouseButtons.Left)
GlobalWinF.MainForm.ToggleFullscreen(); GlobalWin.MainForm.ToggleFullscreen();
} }
private void DestroyDevice() private void DestroyDevice()
@ -462,13 +462,13 @@ namespace BizHawk.Client.EmuHawk
// Wait until device is available or user gets annoyed and closes app // Wait until device is available or user gets annoyed and closes app
Result r; Result r;
// it can take a while for the device to be ready again, so avoid sound looping during the wait // it can take a while for the device to be ready again, so avoid sound looping during the wait
if (GlobalWinF.Sound != null) GlobalWinF.Sound.StopSound(); if (GlobalWin.Sound != null) GlobalWin.Sound.StopSound();
do do
{ {
r = _device.TestCooperativeLevel(); r = _device.TestCooperativeLevel();
Thread.Sleep(100); Thread.Sleep(100);
} while (r == ResultCode.DeviceLost); } while (r == ResultCode.DeviceLost);
if (GlobalWinF.Sound != null) GlobalWinF.Sound.StartSound(); if (GlobalWin.Sound != null) GlobalWin.Sound.StartSound();
// lets try recovery! // lets try recovery!
DestroyDevice(); DestroyDevice();

6
BizHawk.Client.EmuHawk/Throttle.cs
View File

@ -25,7 +25,7 @@ namespace BizHawk.Client.EmuHawk
{ {
get get
{ {
if (GlobalWinF.ClientControls["MaxTurbo"]) if (GlobalWin.ClientControls["MaxTurbo"])
{ {
return 20; return 20;
} }
@ -39,7 +39,7 @@ namespace BizHawk.Client.EmuHawk
{ {
get get
{ {
if (GlobalWinF.ClientControls["MaxTurbo"]) if (GlobalWin.ClientControls["MaxTurbo"])
{ {
return false; return false;
} }
@ -54,7 +54,7 @@ namespace BizHawk.Client.EmuHawk
{ {
get get
{ {
if (GlobalWinF.ClientControls["MaxTurbo"]) if (GlobalWin.ClientControls["MaxTurbo"])
{ {
return false; return false;
} }

6
BizHawk.Client.EmuHawk/config/AutofireConfig.cs
View File

@ -42,15 +42,15 @@ namespace BizHawk.Client.EmuHawk
Global.AutoFireController.On = Global.Config.AutofireOn = (int)OnNumeric.Value; Global.AutoFireController.On = Global.Config.AutofireOn = (int)OnNumeric.Value;
Global.AutoFireController.Off = Global.Config.AutofireOff = (int)OffNumeric.Value; Global.AutoFireController.Off = Global.Config.AutofireOff = (int)OffNumeric.Value;
Global.Config.AutofireLagFrames = LagFrameCheck.Checked; Global.Config.AutofireLagFrames = LagFrameCheck.Checked;
GlobalWinF.AutofireStickyXORAdapter.SetOnOffPatternFromConfig(); GlobalWin.AutofireStickyXORAdapter.SetOnOffPatternFromConfig();
GlobalWinF.OSD.AddMessage("Autofire settings saved"); GlobalWin.OSD.AddMessage("Autofire settings saved");
this.Close(); this.Close();
} }
private void Cancel_Click(object sender, EventArgs e) private void Cancel_Click(object sender, EventArgs e)
{ {
GlobalWinF.OSD.AddMessage("Autofire config aborted"); GlobalWin.OSD.AddMessage("Autofire config aborted");
this.Close(); this.Close();
} }
} }

4
BizHawk.Client.EmuHawk/config/ControllerConfig.cs
View File

@ -259,14 +259,14 @@ namespace BizHawk.Client.EmuHawk
Save(); Save();
GlobalWinF.OSD.AddMessage("Controller settings saved"); GlobalWin.OSD.AddMessage("Controller settings saved");
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
Close(); Close();
} }
private void buttonCancel_Click(object sender, EventArgs e) private void buttonCancel_Click(object sender, EventArgs e)
{ {
GlobalWinF.OSD.AddMessage("Controller config aborted"); GlobalWin.OSD.AddMessage("Controller config aborted");
Close(); Close();
} }

4
BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
View File

@ -33,14 +33,14 @@ namespace BizHawk.Client.EmuHawk
private void IDB_CANCEL_Click(object sender, EventArgs e) private void IDB_CANCEL_Click(object sender, EventArgs e)
{ {
GlobalWinF.OSD.AddMessage("Hotkey config aborted"); GlobalWin.OSD.AddMessage("Hotkey config aborted");
Close(); Close();
} }
private void IDB_SAVE_Click(object sender, EventArgs e) private void IDB_SAVE_Click(object sender, EventArgs e)
{ {
Save(); Save();
GlobalWinF.OSD.AddMessage("Hotkey settings saved"); GlobalWin.OSD.AddMessage("Hotkey settings saved");
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
Close(); Close();
} }

4
BizHawk.Client.EmuHawk/config/MessageConfig.cs
View File

@ -229,7 +229,7 @@ namespace BizHawk.Client.EmuHawk
private void OK_Click(object sender, EventArgs e) private void OK_Click(object sender, EventArgs e)
{ {
SaveSettings(); SaveSettings();
GlobalWinF.OSD.AddMessage("Message settings saved"); GlobalWin.OSD.AddMessage("Message settings saved");
this.Close(); this.Close();
} }
@ -289,7 +289,7 @@ namespace BizHawk.Client.EmuHawk
private void Cancel_Click(object sender, EventArgs e) private void Cancel_Click(object sender, EventArgs e)
{ {
GlobalWinF.OSD.AddMessage("Message config aborted"); GlobalWin.OSD.AddMessage("Message config aborted");
this.Close(); this.Close();
} }

4
BizHawk.Client.EmuHawk/config/PathConfig.cs
View File

@ -58,13 +58,13 @@ namespace BizHawk.Client.EmuHawk
private void OK_Click(object sender, EventArgs e) private void OK_Click(object sender, EventArgs e)
{ {
SaveSettings(); SaveSettings();
GlobalWinF.OSD.AddMessage("Path settings saved"); GlobalWin.OSD.AddMessage("Path settings saved");
Close(); Close();
} }
private void Cancel_Click(object sender, EventArgs e) private void Cancel_Click(object sender, EventArgs e)
{ {
GlobalWinF.OSD.AddMessage("Path config aborted"); GlobalWin.OSD.AddMessage("Path config aborted");
Close(); Close();
} }

18
BizHawk.Client.EmuHawk/config/RewindConfig.cs
View File

@ -19,10 +19,10 @@ namespace BizHawk.Client.EmuHawk
private void RewindConfig_Load(object sender, EventArgs e) private void RewindConfig_Load(object sender, EventArgs e)
{ {
if (GlobalWinF.MainForm.RewindBuf != null) if (GlobalWin.MainForm.RewindBuf != null)
{ {
FullnessLabel.Text = String.Format("{0:0.00}", GlobalWinF.MainForm.Rewind_FullnessRatio * 100) + "%"; FullnessLabel.Text = String.Format("{0:0.00}", GlobalWin.MainForm.Rewind_FullnessRatio * 100) + "%";
RewindFramesUsedLabel.Text = GlobalWinF.MainForm.Rewind_Count.ToString(); RewindFramesUsedLabel.Text = GlobalWin.MainForm.Rewind_Count.ToString();
} }
else else
{ {
@ -111,13 +111,13 @@ namespace BizHawk.Client.EmuHawk
private void Cancel_Click(object sender, EventArgs e) private void Cancel_Click(object sender, EventArgs e)
{ {
GlobalWinF.OSD.AddMessage("Rewind config aborted"); GlobalWin.OSD.AddMessage("Rewind config aborted");
Close(); Close();
} }
private void OK_Click(object sender, EventArgs e) private void OK_Click(object sender, EventArgs e)
{ {
GlobalWinF.OSD.AddMessage("Rewind settings saved"); GlobalWin.OSD.AddMessage("Rewind settings saved");
Global.Config.RewindFrequencySmall = (int)SmallSavestateNumeric.Value; Global.Config.RewindFrequencySmall = (int)SmallSavestateNumeric.Value;
Global.Config.RewindFrequencyMedium = (int)MediumSavestateNumeric.Value; Global.Config.RewindFrequencyMedium = (int)MediumSavestateNumeric.Value;
@ -127,7 +127,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.RewindEnabledMedium = MediumStateEnabledBox.Checked; Global.Config.RewindEnabledMedium = MediumStateEnabledBox.Checked;
Global.Config.RewindEnabledLarge = LargeStateEnabledBox.Checked; Global.Config.RewindEnabledLarge = LargeStateEnabledBox.Checked;
GlobalWinF.MainForm.DoRewindSettings(); GlobalWin.MainForm.DoRewindSettings();
Global.Config.Rewind_UseDelta = UseDeltaCompression.Checked; Global.Config.Rewind_UseDelta = UseDeltaCompression.Checked;
@ -137,7 +137,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.Rewind_BufferSize = (int)BufferSizeUpDown.Value; Global.Config.Rewind_BufferSize = (int)BufferSizeUpDown.Value;
if (Global.Config.Rewind_IsThreaded != RewindIsThreadedCheckbox.Checked) if (Global.Config.Rewind_IsThreaded != RewindIsThreadedCheckbox.Checked)
{ {
GlobalWinF.MainForm.FlagNeedsReboot(); GlobalWin.MainForm.FlagNeedsReboot();
Global.Config.Rewind_IsThreaded = RewindIsThreadedCheckbox.Checked; Global.Config.Rewind_IsThreaded = RewindIsThreadedCheckbox.Checked;
} }
@ -260,9 +260,9 @@ namespace BizHawk.Client.EmuHawk
if (UseDeltaCompression.Checked || StateSize == 0) if (UseDeltaCompression.Checked || StateSize == 0)
{ {
if (GlobalWinF.MainForm.Rewind_Count > 0) if (GlobalWin.MainForm.Rewind_Count > 0)
{ {
avg_state_size = (long)(GlobalWinF.MainForm.Rewind_Size / GlobalWinF.MainForm.Rewind_Count); avg_state_size = (long)(GlobalWin.MainForm.Rewind_Size / GlobalWin.MainForm.Rewind_Count);
} }
else else
{ {

10
BizHawk.Client.EmuHawk/config/SoundConfig.cs
View File

@ -49,16 +49,16 @@ namespace BizHawk.Client.EmuHawk
Global.Config.SoundVolume = SoundVolBar.Value; Global.Config.SoundVolume = SoundVolBar.Value;
Global.Config.SoundThrottle = ThrottlecheckBox.Checked; Global.Config.SoundThrottle = ThrottlecheckBox.Checked;
Global.Config.SoundDevice = (string)listBoxSoundDevices.SelectedItem ?? "<default>"; Global.Config.SoundDevice = (string)listBoxSoundDevices.SelectedItem ?? "<default>";
GlobalWinF.Sound.ChangeVolume(Global.Config.SoundVolume); GlobalWin.Sound.ChangeVolume(Global.Config.SoundVolume);
GlobalWinF.Sound.UpdateSoundSettings(); GlobalWin.Sound.UpdateSoundSettings();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
GlobalWinF.OSD.AddMessage("Sound settings saved"); GlobalWin.OSD.AddMessage("Sound settings saved");
this.Close(); this.Close();
} }
private void Cancel_Click(object sender, EventArgs e) private void Cancel_Click(object sender, EventArgs e)
{ {
GlobalWinF.OSD.AddMessage("Sound config aborted"); GlobalWin.OSD.AddMessage("Sound config aborted");
this.Close(); this.Close();
} }

14
BizHawk.Client.EmuHawk/movie/PlayMovie.cs
View File

@ -69,7 +69,7 @@ namespace BizHawk.Client.EmuHawk
//Import file if necessary //Import file if necessary
GlobalWinF.MainForm.StartNewMovie(MovieList[MovieView.SelectedIndices[0]], false); GlobalWin.MainForm.StartNewMovie(MovieList[MovieView.SelectedIndices[0]], false);
} }
private void OK_Click(object sender, EventArgs e) private void OK_Click(object sender, EventArgs e)
@ -85,9 +85,9 @@ namespace BizHawk.Client.EmuHawk
string filter = "Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|Savestates|*.state|All Files|*.*"; string filter = "Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|Savestates|*.state|All Files|*.*";
ofd.Filter = filter; ofd.Filter = filter;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = ofd.ShowDialog(); var result = ofd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
var file = new FileInfo(ofd.FileName); var file = new FileInfo(ofd.FileName);
@ -97,7 +97,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (file.Extension.ToUpper() == "STATE") if (file.Extension.ToUpper() == "STATE")
{ {
Movie m = new Movie(file.FullName, GlobalWinF.MainForm.GetEmuVersion()); Movie m = new Movie(file.FullName, GlobalWin.MainForm.GetEmuVersion());
m.LoadMovie(); //State files will have to load everything unfortunately m.LoadMovie(); //State files will have to load everything unfortunately
if (m.Frames == 0) if (m.Frames == 0)
{ {
@ -126,7 +126,7 @@ namespace BizHawk.Client.EmuHawk
int x = IsDuplicate(filename); int x = IsDuplicate(filename);
if (x == 0) if (x == 0)
{ {
Movie m = new Movie(file.CanonicalFullPath, GlobalWinF.MainForm.GetEmuVersion()); Movie m = new Movie(file.CanonicalFullPath, GlobalWin.MainForm.GetEmuVersion());
m.LoadMovie(); //State files will have to load everything unfortunately m.LoadMovie(); //State files will have to load everything unfortunately
if (m.Frames > 0) if (m.Frames > 0)
{ {
@ -178,7 +178,7 @@ namespace BizHawk.Client.EmuHawk
private void PreLoadMovieFile(HawkFile path, bool force) private void PreLoadMovieFile(HawkFile path, bool force)
{ {
Movie m = new Movie(path.CanonicalFullPath, GlobalWinF.MainForm.GetEmuVersion()); Movie m = new Movie(path.CanonicalFullPath, GlobalWin.MainForm.GetEmuVersion());
m.PreLoadText(); m.PreLoadText();
if (path.Extension == ".FM2") if (path.Extension == ".FM2")
{ {
@ -391,7 +391,7 @@ namespace BizHawk.Client.EmuHawk
} }
break; break;
case MovieHeader.EMULATIONVERSION: case MovieHeader.EMULATIONVERSION:
if (kvp.Value != GlobalWinF.MainForm.GetEmuVersion()) if (kvp.Value != GlobalWin.MainForm.GetEmuVersion())
{ {
item.BackColor = Color.Yellow; item.BackColor = Color.Yellow;
} }

10
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

@ -58,11 +58,11 @@ namespace BizHawk.Client.EmuHawk
} }
MovieToRecord = new Movie(path, GlobalWinF.MainForm.GetEmuVersion()); MovieToRecord = new Movie(path, GlobalWin.MainForm.GetEmuVersion());
//Header //Header
MovieToRecord.Header.SetHeaderLine(MovieHeader.AUTHOR, AuthorBox.Text); MovieToRecord.Header.SetHeaderLine(MovieHeader.AUTHOR, AuthorBox.Text);
MovieToRecord.Header.SetHeaderLine(MovieHeader.EMULATIONVERSION, GlobalWinF.MainForm.GetEmuVersion()); MovieToRecord.Header.SetHeaderLine(MovieHeader.EMULATIONVERSION, GlobalWin.MainForm.GetEmuVersion());
MovieToRecord.Header.SetHeaderLine(MovieHeader.MOVIEVERSION, MovieHeader.MovieVersion); MovieToRecord.Header.SetHeaderLine(MovieHeader.MOVIEVERSION, MovieHeader.MovieVersion);
MovieToRecord.Header.SetHeaderLine(MovieHeader.GUID, MovieHeader.MakeGUID()); MovieToRecord.Header.SetHeaderLine(MovieHeader.GUID, MovieHeader.MakeGUID());
MovieToRecord.Header.SetHeaderLine(MovieHeader.PLATFORM, Global.Game.System); MovieToRecord.Header.SetHeaderLine(MovieHeader.PLATFORM, Global.Game.System);
@ -162,7 +162,7 @@ namespace BizHawk.Client.EmuHawk
} }
} }
} }
GlobalWinF.MainForm.StartNewMovie(MovieToRecord, true); GlobalWin.MainForm.StartNewMovie(MovieToRecord, true);
Global.Config.UseDefaultAuthor = DefaultAuthorCheckBox.Checked; Global.Config.UseDefaultAuthor = DefaultAuthorCheckBox.Checked;
if (DefaultAuthorCheckBox.Checked) if (DefaultAuthorCheckBox.Checked)
@ -196,9 +196,9 @@ namespace BizHawk.Client.EmuHawk
string filter = "Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|Savestates|*.state|All Files|*.*"; string filter = "Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|Savestates|*.state|All Files|*.*";
sfd.Filter = filter; sfd.Filter = filter;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
filename = sfd.FileName; filename = sfd.FileName;

8
BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.cs
View File

@ -144,9 +144,9 @@ namespace BizHawk.Client.EmuHawk
if (Global.CheatList.Changes) if (Global.CheatList.Changes)
{ {
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
DialogResult result = MessageBox.Show("Save Changes?", "Cheats", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3); DialogResult result = MessageBox.Show("Save Changes?", "Cheats", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3);
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result == DialogResult.Yes) if (result == DialogResult.Yes)
{ {
Global.CheatList.Save(); Global.CheatList.Save();
@ -572,7 +572,7 @@ namespace BizHawk.Client.EmuHawk
if (result) if (result)
{ {
Global.CheatList.NewList(GlobalWinF.MainForm.GenerateDefaultCheatFilename()); Global.CheatList.NewList(GlobalWin.MainForm.GenerateDefaultCheatFilename());
UpdateListView(); UpdateListView();
UpdateMessageLabel(); UpdateMessageLabel();
ToolHelpers.UpdateCheatRelatedTools(); ToolHelpers.UpdateCheatRelatedTools();
@ -744,7 +744,7 @@ namespace BizHawk.Client.EmuHawk
private void OpenGameGenieEncoderDecoderMenuItem_Click(object sender, EventArgs e) private void OpenGameGenieEncoderDecoderMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.LoadGameGenieEC(); GlobalWin.MainForm.LoadGameGenieEC();
} }
#endregion #endregion

4
BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
View File

@ -961,9 +961,9 @@ namespace BizHawk.Client.EmuHawk
dlg.FullOpen = true; dlg.FullOpen = true;
dlg.Color = spriteback; dlg.Color = spriteback;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = dlg.ShowDialog(); var result = dlg.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
// force full opaque // force full opaque

10
BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.cs
View File

@ -27,8 +27,8 @@ namespace BizHawk.Client.EmuHawk
if (colorDialog1.ShowDialog() == DialogResult.OK) if (colorDialog1.ShowDialog() == DialogResult.OK)
{ {
Global.Config.HexBackgrndColor = colorDialog1.Color; Global.Config.HexBackgrndColor = colorDialog1.Color;
GlobalWinF.Tools.HexEditor.Header.BackColor = colorDialog1.Color; GlobalWin.Tools.HexEditor.Header.BackColor = colorDialog1.Color;
GlobalWinF.Tools.HexEditor.MemoryViewerBox.BackColor = Global.Config.HexBackgrndColor; GlobalWin.Tools.HexEditor.MemoryViewerBox.BackColor = Global.Config.HexBackgrndColor;
HexBackgrnd.BackColor = colorDialog1.Color; HexBackgrnd.BackColor = colorDialog1.Color;
} }
} }
@ -38,8 +38,8 @@ namespace BizHawk.Client.EmuHawk
if (colorDialog1.ShowDialog() == DialogResult.OK) if (colorDialog1.ShowDialog() == DialogResult.OK)
{ {
Global.Config.HexForegrndColor = colorDialog1.Color; Global.Config.HexForegrndColor = colorDialog1.Color;
GlobalWinF.Tools.HexEditor.Header.ForeColor = colorDialog1.Color; GlobalWin.Tools.HexEditor.Header.ForeColor = colorDialog1.Color;
GlobalWinF.Tools.HexEditor.MemoryViewerBox.ForeColor = Global.Config.HexForegrndColor; GlobalWin.Tools.HexEditor.MemoryViewerBox.ForeColor = Global.Config.HexForegrndColor;
HexForegrnd.BackColor = colorDialog1.Color; HexForegrnd.BackColor = colorDialog1.Color;
} }
@ -50,7 +50,7 @@ namespace BizHawk.Client.EmuHawk
if (colorDialog1.ShowDialog() == DialogResult.OK) if (colorDialog1.ShowDialog() == DialogResult.OK)
{ {
Global.Config.HexMenubarColor = colorDialog1.Color; Global.Config.HexMenubarColor = colorDialog1.Color;
GlobalWinF.Tools.HexEditor.menuStrip1.BackColor = Global.Config.HexMenubarColor; GlobalWin.Tools.HexEditor.menuStrip1.BackColor = Global.Config.HexMenubarColor;
HexMenubar.BackColor = colorDialog1.Color; HexMenubar.BackColor = colorDialog1.Color;
} }
} }

42
BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
View File

@ -390,7 +390,7 @@ namespace BizHawk.Client.EmuHawk
private bool CurrentROMIsArchive() private bool CurrentROMIsArchive()
{ {
string path = GlobalWinF.MainForm.CurrentlyOpenRom; string path = GlobalWin.MainForm.CurrentlyOpenRom;
if (path == null) if (path == null)
{ {
return false; return false;
@ -418,7 +418,7 @@ namespace BizHawk.Client.EmuHawk
private byte[] GetRomBytes() private byte[] GetRomBytes()
{ {
string path = GlobalWinF.MainForm.CurrentlyOpenRom; string path = GlobalWin.MainForm.CurrentlyOpenRom;
if (path == null) if (path == null)
{ {
return null; return null;
@ -540,9 +540,9 @@ namespace BizHawk.Client.EmuHawk
InputPrompt i = new InputPrompt { Text = "Go to Address" }; InputPrompt i = new InputPrompt { Text = "Go to Address" };
i._Location = GetPromptPoint(); i._Location = GetPromptPoint();
i.SetMessage("Enter a hexadecimal value"); i.SetMessage("Enter a hexadecimal value");
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
i.ShowDialog(); i.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (i.UserOK) if (i.UserOK)
{ {
@ -710,16 +710,16 @@ namespace BizHawk.Client.EmuHawk
{ {
if (HighlightedAddress.HasValue || SecondaryHighlightedAddresses.Count > 0) if (HighlightedAddress.HasValue || SecondaryHighlightedAddresses.Count > 0)
{ {
GlobalWinF.MainForm.LoadRamWatch(true); GlobalWin.MainForm.LoadRamWatch(true);
} }
if (HighlightedAddress.HasValue) if (HighlightedAddress.HasValue)
{ {
GlobalWinF.Tools.RamWatch.AddWatch(MakeWatch(HighlightedAddress.Value)); GlobalWin.Tools.RamWatch.AddWatch(MakeWatch(HighlightedAddress.Value));
} }
foreach (int i in SecondaryHighlightedAddresses) foreach (int i in SecondaryHighlightedAddresses)
{ {
GlobalWinF.Tools.RamWatch.AddWatch(MakeWatch(i)); GlobalWin.Tools.RamWatch.AddWatch(MakeWatch(i));
} }
} }
@ -757,10 +757,10 @@ namespace BizHawk.Client.EmuHawk
poke.SetWatch(Watches); poke.SetWatch(Watches);
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = poke.ShowDialog(); var result = poke.ShowDialog();
UpdateValues(); UpdateValues();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
} }
} }
@ -898,10 +898,10 @@ namespace BizHawk.Client.EmuHawk
private void UpdateRelatedDialogs() private void UpdateRelatedDialogs()
{ {
GlobalWinF.Tools.UpdateValues<RamWatch>(); GlobalWin.Tools.UpdateValues<RamWatch>();
GlobalWinF.Tools.UpdateValues<RamSearch>(); GlobalWin.Tools.UpdateValues<RamSearch>();
GlobalWinF.Tools.UpdateValues<Cheats>(); GlobalWin.Tools.UpdateValues<Cheats>();
GlobalWinF.MainForm.UpdateCheatStatus(); GlobalWin.MainForm.UpdateCheatStatus();
UpdateValues(); UpdateValues();
} }
@ -1014,9 +1014,9 @@ namespace BizHawk.Client.EmuHawk
sfd.Filter = "Text (*.txt)|*.txt|All Files|*.*"; sfd.Filter = "Text (*.txt)|*.txt|All Files|*.*";
sfd.RestoreDirectory = true; sfd.RestoreDirectory = true;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return null; return null;
var file = new FileInfo(sfd.FileName); var file = new FileInfo(sfd.FileName);
@ -1027,7 +1027,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Domain.Name == "ROM File") if (Domain.Name == "ROM File")
{ {
string extension = Path.GetExtension(GlobalWinF.MainForm.CurrentlyOpenRom); string extension = Path.GetExtension(GlobalWin.MainForm.CurrentlyOpenRom);
return "Binary (*" + extension + ")|*" + extension + "|All Files|*.*"; return "Binary (*" + extension + ")|*" + extension + "|All Files|*.*";
} }
@ -1051,9 +1051,9 @@ namespace BizHawk.Client.EmuHawk
sfd.Filter = GetSaveFileFilter(); sfd.Filter = GetSaveFileFilter();
sfd.RestoreDirectory = true; sfd.RestoreDirectory = true;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return null; return null;
var file = new FileInfo(sfd.FileName); var file = new FileInfo(sfd.FileName);
@ -2066,9 +2066,9 @@ namespace BizHawk.Client.EmuHawk
private void setColorsToolStripMenuItem1_Click(object sender, EventArgs e) private void setColorsToolStripMenuItem1_Click(object sender, EventArgs e)
{ {
HexColors_Form h = new HexColors_Form(); HexColors_Form h = new HexColors_Form();
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
h.ShowDialog(); h.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
} }
private void resetToDefaultToolStripMenuItem1_Click(object sender, EventArgs e) private void resetToDefaultToolStripMenuItem1_Click(object sender, EventArgs e)
@ -2128,7 +2128,7 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
FileInfo file = new FileInfo(GlobalWinF.MainForm.CurrentlyOpenRom); FileInfo file = new FileInfo(GlobalWin.MainForm.CurrentlyOpenRom);
SaveFileBinary(file); SaveFileBinary(file);
} }
} }

6
BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
View File

@ -60,12 +60,12 @@ namespace BizHawk.Client.EmuHawk
private void Find_Prev_Click(object sender, EventArgs e) private void Find_Prev_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.HexEditor.FindPrev(GetFindBoxChars(), false); GlobalWin.Tools.HexEditor.FindPrev(GetFindBoxChars(), false);
} }
private void Find_Next_Click(object sender, EventArgs e) private void Find_Next_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.HexEditor.FindNext(GetFindBoxChars(), false); GlobalWin.Tools.HexEditor.FindNext(GetFindBoxChars(), false);
} }
private void ChangeCasing() private void ChangeCasing()
@ -94,7 +94,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (e.KeyData == Keys.Enter) if (e.KeyData == Keys.Enter)
{ {
GlobalWinF.Tools.HexEditor.FindNext(GetFindBoxChars(), false); GlobalWin.Tools.HexEditor.FindNext(GetFindBoxChars(), false);
} }
} }
} }

4
BizHawk.Client.EmuHawk/tools/HexEditor/MemoryViewer.cs
View File

@ -518,9 +518,9 @@ namespace BizHawk.Client.EmuHawk
{ {
InputPrompt i = new InputPrompt {Text = "Go to Address"}; InputPrompt i = new InputPrompt {Text = "Go to Address"};
i.SetMessage("Enter a hexadecimal value"); i.SetMessage("Enter a hexadecimal value");
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
i.ShowDialog(); i.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (i.UserOK) if (i.UserOK)
{ {

64
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
View File

@ -57,7 +57,7 @@ namespace BizHawk.Client.EmuHawk
public static void client_closerom() public static void client_closerom()
{ {
GlobalWinF.MainForm.CloseROM(); GlobalWin.MainForm.CloseROM();
} }
public static void client_enablerewind(object boolean) public static void client_enablerewind(object boolean)
@ -67,13 +67,13 @@ namespace BizHawk.Client.EmuHawk
{ {
if (temp == "0" || temp.ToLower() == "false") if (temp == "0" || temp.ToLower() == "false")
{ {
GlobalWinF.MainForm.RewindActive = false; GlobalWin.MainForm.RewindActive = false;
GlobalWinF.OSD.AddMessage("Rewind suspended"); GlobalWin.OSD.AddMessage("Rewind suspended");
} }
else else
{ {
GlobalWinF.MainForm.RewindActive = true; GlobalWin.MainForm.RewindActive = true;
GlobalWinF.OSD.AddMessage("Rewind enabled"); GlobalWin.OSD.AddMessage("Rewind enabled");
} }
} }
} }
@ -87,7 +87,7 @@ namespace BizHawk.Client.EmuHawk
if (frames > 0) if (frames > 0)
{ {
Global.Config.FrameSkip = frames; Global.Config.FrameSkip = frames;
GlobalWinF.MainForm.FrameSkipMessage(); GlobalWin.MainForm.FrameSkipMessage();
} }
else else
{ {
@ -102,7 +102,7 @@ namespace BizHawk.Client.EmuHawk
public static bool client_ispaused() public static bool client_ispaused()
{ {
return GlobalWinF.MainForm.EmulatorPaused; return GlobalWin.MainForm.EmulatorPaused;
} }
public static int client_getwindowsize() public static int client_getwindowsize()
@ -112,84 +112,84 @@ namespace BizHawk.Client.EmuHawk
public static void client_opencheats() public static void client_opencheats()
{ {
GlobalWinF.Tools.Load<Cheats>(); GlobalWin.Tools.Load<Cheats>();
} }
public static void client_openhexeditor() public static void client_openhexeditor()
{ {
GlobalWinF.Tools.Load<HexEditor>(); GlobalWin.Tools.Load<HexEditor>();
} }
public static void client_openramwatch() public static void client_openramwatch()
{ {
GlobalWinF.MainForm.LoadRamWatch(true); GlobalWin.MainForm.LoadRamWatch(true);
} }
public static void client_openramsearch() public static void client_openramsearch()
{ {
GlobalWinF.Tools.Load<RamSearch>(); GlobalWin.Tools.Load<RamSearch>();
} }
public static void client_openrom(object lua_input) public static void client_openrom(object lua_input)
{ {
GlobalWinF.MainForm.LoadRom(lua_input.ToString()); GlobalWin.MainForm.LoadRom(lua_input.ToString());
} }
public static void client_opentasstudio() public static void client_opentasstudio()
{ {
GlobalWinF.MainForm.LoadTAStudio(); GlobalWin.MainForm.LoadTAStudio();
} }
public static void client_opentoolbox() public static void client_opentoolbox()
{ {
GlobalWinF.Tools.Load<ToolBox>(); GlobalWin.Tools.Load<ToolBox>();
} }
public static void client_opentracelogger() public static void client_opentracelogger()
{ {
GlobalWinF.MainForm.LoadTraceLogger(); GlobalWin.MainForm.LoadTraceLogger();
} }
public static void client_paint() public static void client_paint()
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
} }
public static void client_pause() public static void client_pause()
{ {
GlobalWinF.MainForm.PauseEmulator(); GlobalWin.MainForm.PauseEmulator();
} }
public static void client_pause_av() public static void client_pause_av()
{ {
GlobalWinF.MainForm.PauseAVI = true; GlobalWin.MainForm.PauseAVI = true;
} }
public static void client_reboot_core() public static void client_reboot_core()
{ {
GlobalWinF.MainForm.RebootCore(); GlobalWin.MainForm.RebootCore();
} }
public static int client_screenheight() public static int client_screenheight()
{ {
return GlobalWinF.RenderPanel.NativeSize.Height; return GlobalWin.RenderPanel.NativeSize.Height;
} }
public static void client_screenshot(object path = null) public static void client_screenshot(object path = null)
{ {
if (path == null) if (path == null)
{ {
GlobalWinF.MainForm.TakeScreenshot(); GlobalWin.MainForm.TakeScreenshot();
} }
else else
{ {
GlobalWinF.MainForm.TakeScreenshot(path.ToString()); GlobalWin.MainForm.TakeScreenshot(path.ToString());
} }
} }
public static void client_screenshottoclipboard() public static void client_screenshottoclipboard()
{ {
GlobalWinF.MainForm.TakeScreenshotToClipboard(); GlobalWin.MainForm.TakeScreenshotToClipboard();
} }
public static void client_setscreenshotosd(bool value) public static void client_setscreenshotosd(bool value)
@ -199,7 +199,7 @@ namespace BizHawk.Client.EmuHawk
public static int client_screenwidth() public static int client_screenwidth()
{ {
return GlobalWinF.RenderPanel.NativeSize.Width; return GlobalWin.RenderPanel.NativeSize.Width;
} }
public void client_setwindowsize(object window_size) public void client_setwindowsize(object window_size)
@ -211,8 +211,8 @@ namespace BizHawk.Client.EmuHawk
if (size == 1 || size == 2 || size == 3 || size == 4 || size == 5 || size == 10) if (size == 1 || size == 2 || size == 3 || size == 4 || size == 5 || size == 10)
{ {
Global.Config.TargetZoomFactor = size; Global.Config.TargetZoomFactor = size;
GlobalWinF.MainForm.FrameBufferResized(); GlobalWin.MainForm.FrameBufferResized();
GlobalWinF.OSD.AddMessage("Window size set to " + size.ToString() + "x"); GlobalWin.OSD.AddMessage("Window size set to " + size.ToString() + "x");
} }
else else
{ {
@ -235,7 +235,7 @@ namespace BizHawk.Client.EmuHawk
int speed = Convert.ToInt32(percent.ToString()); int speed = Convert.ToInt32(percent.ToString());
if (speed > 0 && speed < 1600) //arbituarily capping it at 1600% if (speed > 0 && speed < 1600) //arbituarily capping it at 1600%
{ {
GlobalWinF.MainForm.ClickSpeedItem(speed); GlobalWin.MainForm.ClickSpeedItem(speed);
} }
else else
{ {
@ -250,27 +250,27 @@ namespace BizHawk.Client.EmuHawk
public static void client_togglepause() public static void client_togglepause()
{ {
GlobalWinF.MainForm.TogglePause(); GlobalWin.MainForm.TogglePause();
} }
public static void client_unpause() public static void client_unpause()
{ {
GlobalWinF.MainForm.UnpauseEmulator(); GlobalWin.MainForm.UnpauseEmulator();
} }
public static void client_unpause_av() public static void client_unpause_av()
{ {
GlobalWinF.MainForm.PauseAVI = false; GlobalWin.MainForm.PauseAVI = false;
} }
public static int client_xpos() public static int client_xpos()
{ {
return GlobalWinF.MainForm.DesktopLocation.X; return GlobalWin.MainForm.DesktopLocation.X;
} }
public static int client_ypos() public static int client_ypos()
{ {
return GlobalWinF.MainForm.DesktopLocation.Y; return GlobalWin.MainForm.DesktopLocation.Y;
} }
} }
} }

10
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
View File

@ -26,13 +26,13 @@ namespace BizHawk.Client.EmuHawk
public static void console_clear() public static void console_clear()
{ {
GlobalWinF.Tools.LuaConsole.ClearOutputWindow(); GlobalWin.Tools.LuaConsole.ClearOutputWindow();
} }
public static string console_getluafunctionslist() public static string console_getluafunctionslist()
{ {
StringBuilder list = new StringBuilder(); StringBuilder list = new StringBuilder();
foreach (var function in GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList) foreach (var function in GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList)
{ {
list.AppendLine(function.Name); list.AppendLine(function.Name);
} }
@ -48,7 +48,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (lua_input == null) if (lua_input == null)
{ {
GlobalWinF.Tools.LuaConsole.WriteToOutputWindow("NULL"); GlobalWin.Tools.LuaConsole.WriteToOutputWindow("NULL");
} }
else else
{ {
@ -81,11 +81,11 @@ namespace BizHawk.Client.EmuHawk
.AppendLine(); .AppendLine();
} }
GlobalWinF.Tools.LuaConsole.WriteToOutputWindow(sb.ToString()); GlobalWin.Tools.LuaConsole.WriteToOutputWindow(sb.ToString());
} }
else else
{ {
GlobalWinF.Tools.LuaConsole.WriteToOutputWindow(lua_input.ToString()); GlobalWin.Tools.LuaConsole.WriteToOutputWindow(lua_input.ToString());
} }
} }
} }

34
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
View File

@ -63,12 +63,12 @@ namespace BizHawk.Client.EmuHawk
/// </summary> /// </summary>
public void DrawNew() public void DrawNew()
{ {
luaSurface = GlobalWinF.DisplayManager.GetLuaSurfaceNative(); luaSurface = GlobalWin.DisplayManager.GetLuaSurfaceNative();
} }
public void DrawNewEmu() public void DrawNewEmu()
{ {
luaSurface = GlobalWinF.DisplayManager.GetLuaEmuSurfaceEmu(); luaSurface = GlobalWin.DisplayManager.GetLuaEmuSurfaceEmu();
} }
/// <summary> /// <summary>
@ -78,13 +78,13 @@ namespace BizHawk.Client.EmuHawk
/// </summary> /// </summary>
public void DrawFinish() public void DrawFinish()
{ {
GlobalWinF.DisplayManager.SetLuaSurfaceNativePreOSD(luaSurface); GlobalWin.DisplayManager.SetLuaSurfaceNativePreOSD(luaSurface);
luaSurface = null; luaSurface = null;
} }
public void DrawFinishEmu() public void DrawFinishEmu()
{ {
GlobalWinF.DisplayManager.SetLuaSurfaceEmu(luaSurface); GlobalWin.DisplayManager.SetLuaSurfaceEmu(luaSurface);
luaSurface = null; luaSurface = null;
} }
@ -187,14 +187,14 @@ namespace BizHawk.Client.EmuHawk
dx *= MultiClientLuaLibrary.client_getwindowsize(); dx *= MultiClientLuaLibrary.client_getwindowsize();
dy *= MultiClientLuaLibrary.client_getwindowsize(); dy *= MultiClientLuaLibrary.client_getwindowsize();
GlobalWinF.OSD.AddGUIText(luaStr.ToString(), dx, dy, alert, GetColor(background), GetColor(forecolor), a); GlobalWin.OSD.AddGUIText(luaStr.ToString(), dx, dy, alert, GetColor(background), GetColor(forecolor), a);
} }
#endregion #endregion
public void gui_addmessage(object luaStr) public void gui_addmessage(object luaStr)
{ {
GlobalWinF.OSD.AddMessage(luaStr.ToString()); GlobalWin.OSD.AddMessage(luaStr.ToString());
} }
public void gui_alert(object luaX, object luaY, object luaStr, object anchor = null) public void gui_alert(object luaX, object luaY, object luaStr, object anchor = null)
@ -204,18 +204,18 @@ namespace BizHawk.Client.EmuHawk
public void gui_clearGraphics() public void gui_clearGraphics()
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
luaSurface.Clear(); luaSurface.Clear();
} }
public static void gui_cleartext() public static void gui_cleartext()
{ {
GlobalWinF.OSD.ClearGUIText(); GlobalWin.OSD.ClearGUIText();
} }
public void gui_drawBezier(LuaTable points, object color) public void gui_drawBezier(LuaTable points, object color)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
using (var g = GetGraphics()) using (var g = GetGraphics())
{ {
try try
@ -286,7 +286,7 @@ namespace BizHawk.Client.EmuHawk
public void gui_drawEllipse(object X, object Y, object width, object height, object line, object background = null) public void gui_drawEllipse(object X, object Y, object width, object height, object line, object background = null)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
using (var g = GetGraphics()) using (var g = GetGraphics())
{ {
try try
@ -308,7 +308,7 @@ namespace BizHawk.Client.EmuHawk
public void gui_drawIcon(object Path, object x, object y, object width = null, object height = null) public void gui_drawIcon(object Path, object x, object y, object width = null, object height = null)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
using (var g = GetGraphics()) using (var g = GetGraphics())
{ {
try try
@ -334,7 +334,7 @@ namespace BizHawk.Client.EmuHawk
public void gui_drawImage(object Path, object x, object y, object width = null, object height = null) public void gui_drawImage(object Path, object x, object y, object width = null, object height = null)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
using (var g = GetGraphics()) using (var g = GetGraphics())
{ {
try try
@ -357,7 +357,7 @@ namespace BizHawk.Client.EmuHawk
public void gui_drawLine(object x1, object y1, object x2, object y2, object color = null) public void gui_drawLine(object x1, object y1, object x2, object y2, object color = null)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
using (var g = GetGraphics()) using (var g = GetGraphics())
{ {
try try
@ -374,7 +374,7 @@ namespace BizHawk.Client.EmuHawk
public void gui_drawPie(object X, object Y, object width, object height, object startangle, object sweepangle, public void gui_drawPie(object X, object Y, object width, object height, object startangle, object sweepangle,
object line, object background = null) object line, object background = null)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
using (var g = GetGraphics()) using (var g = GetGraphics())
{ {
try try
@ -397,7 +397,7 @@ namespace BizHawk.Client.EmuHawk
public void gui_drawPixel(object X, object Y, object color = null) public void gui_drawPixel(object X, object Y, object color = null)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
using (var g = GetGraphics()) using (var g = GetGraphics())
{ {
float x = LuaInt(X) + 0.1F; float x = LuaInt(X) + 0.1F;
@ -414,7 +414,7 @@ namespace BizHawk.Client.EmuHawk
public void gui_drawPolygon(LuaTable points, object line, object background = null) public void gui_drawPolygon(LuaTable points, object line, object background = null)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
//this is a test //this is a test
using (var g = GetGraphics()) using (var g = GetGraphics())
{ {
@ -473,7 +473,7 @@ namespace BizHawk.Client.EmuHawk
public void gui_drawText(object X, object Y, object message, object color = null, object fontsize = null, object fontfamily = null, object fontstyle = null) public void gui_drawText(object X, object Y, object message, object color = null, object fontsize = null, object fontfamily = null, object fontstyle = null)
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
using (var g = GetGraphics()) using (var g = GetGraphics())
{ {
try try

4
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Input.cs
View File

@ -32,7 +32,7 @@ namespace BizHawk.Client.EmuHawk
public LuaTable input_get() public LuaTable input_get()
{ {
LuaTable buttons = _lua.NewTable(); LuaTable buttons = _lua.NewTable();
foreach (var kvp in GlobalWinF.ControllerInputCoalescer.BoolButtons()) foreach (var kvp in GlobalWin.ControllerInputCoalescer.BoolButtons())
if (kvp.Value) if (kvp.Value)
buttons[kvp.Key] = true; buttons[kvp.Key] = true;
return buttons; return buttons;
@ -41,7 +41,7 @@ namespace BizHawk.Client.EmuHawk
public LuaTable input_getmouse() public LuaTable input_getmouse()
{ {
LuaTable buttons = _lua.NewTable(); LuaTable buttons = _lua.NewTable();
Point p = GlobalWinF.RenderPanel.ScreenToScreen(Control.MousePosition); Point p = GlobalWin.RenderPanel.ScreenToScreen(Control.MousePosition);
buttons["X"] = p.X; buttons["X"] = p.X;
buttons["Y"] = p.Y; buttons["Y"] = p.Y;
buttons[MouseButtons.Left.ToString()] = (Control.MouseButtons & MouseButtons.Left) != 0; buttons[MouseButtons.Left.ToString()] = (Control.MouseButtons & MouseButtons.Left) != 0;

8
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs
View File

@ -25,7 +25,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (lua_input is string) if (lua_input is string)
{ {
GlobalWinF.MainForm.LoadStateFile(lua_input.ToString(), Path.GetFileName(lua_input.ToString()), true); GlobalWin.MainForm.LoadStateFile(lua_input.ToString(), Path.GetFileName(lua_input.ToString()), true);
} }
} }
@ -35,7 +35,7 @@ namespace BizHawk.Client.EmuHawk
if (slot >= 0 && slot <= 9) if (slot >= 0 && slot <= 9)
{ {
GlobalWinF.MainForm.LoadState("QuickSave" + slot.ToString(), true); GlobalWin.MainForm.LoadState("QuickSave" + slot.ToString(), true);
} }
} }
@ -44,7 +44,7 @@ namespace BizHawk.Client.EmuHawk
if (lua_input is string) if (lua_input is string)
{ {
string path = lua_input.ToString(); string path = lua_input.ToString();
GlobalWinF.MainForm.SaveStateFile(path, path, true); GlobalWin.MainForm.SaveStateFile(path, path, true);
} }
} }
@ -54,7 +54,7 @@ namespace BizHawk.Client.EmuHawk
if (slot >= 0 && slot <= 9) if (slot >= 0 && slot <= 9)
{ {
GlobalWinF.MainForm.SaveState("QuickSave" + slot.ToString()); GlobalWin.MainForm.SaveState("QuickSave" + slot.ToString());
} }
} }
} }

2
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
View File

@ -145,7 +145,7 @@ namespace BizHawk.Client.EmuHawk
private void EmuYield() private void EmuYield()
{ {
GlobalWinF.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
currThread.Yield(0); currThread.Yield(0);
} }
} }

18
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -183,9 +183,9 @@ namespace BizHawk.Client.EmuHawk
if (!Directory.Exists(ofd.InitialDirectory)) if (!Directory.Exists(ofd.InitialDirectory))
Directory.CreateDirectory(ofd.InitialDirectory); Directory.CreateDirectory(ofd.InitialDirectory);
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = ofd.ShowDialog(); var result = ofd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return null; return null;
var file = new FileInfo(ofd.FileName); var file = new FileInfo(ofd.FileName);
@ -713,9 +713,9 @@ namespace BizHawk.Client.EmuHawk
private void luaFunctionsListToolStripMenuItem_Click(object sender, EventArgs e) private void luaFunctionsListToolStripMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
new LuaFunctionsForm().Show(); new LuaFunctionsForm().Show();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
} }
public bool LoadLuaSession(string path) public bool LoadLuaSession(string path)
@ -922,9 +922,9 @@ namespace BizHawk.Client.EmuHawk
} }
sfd.Filter = "Lua Session Files (*.luases)|*.luases|All Files|*.*"; sfd.Filter = "Lua Session Files (*.luases)|*.luases|All Files|*.*";
sfd.RestoreDirectory = true; sfd.RestoreDirectory = true;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return null; return null;
var file = new FileInfo(sfd.FileName); var file = new FileInfo(sfd.FileName);
@ -1019,9 +1019,9 @@ namespace BizHawk.Client.EmuHawk
if (changes) if (changes)
{ {
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
DialogResult result = MessageBox.Show("Save changes to session?", "Lua Console", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3); DialogResult result = MessageBox.Show("Save changes to session?", "Lua Console", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3);
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result == DialogResult.Yes) if (result == DialogResult.Yes)
{ {
if (string.Compare(currentSessionFile, "") == 0) if (string.Compare(currentSessionFile, "") == 0)
@ -1101,7 +1101,7 @@ namespace BizHawk.Client.EmuHawk
turnOffAllScriptsToolStripMenuItem.Enabled = luaRunning; turnOffAllScriptsToolStripMenuItem.Enabled = luaRunning;
showRegisteredFunctionsToolStripMenuItem.Enabled = GlobalWinF.Tools.LuaConsole.LuaImp.RegisteredFunctions.Any(); showRegisteredFunctionsToolStripMenuItem.Enabled = GlobalWin.Tools.LuaConsole.LuaImp.RegisteredFunctions.Any();
} }
private void contextMenuStrip1_Opening(object sender, CancelEventArgs e) private void contextMenuStrip1_Opening(object sender, CancelEventArgs e)

20
BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs
View File

@ -24,7 +24,7 @@ namespace BizHawk.Client.EmuHawk
private void PopulateListView() private void PopulateListView()
{ {
FunctionView.Items.Clear(); FunctionView.Items.Clear();
foreach (LuaDocumentation.LibraryFunction l in GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList) foreach (LuaDocumentation.LibraryFunction l in GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList)
{ {
ListViewItem item = new ListViewItem {Text = l.ReturnType}; ListViewItem item = new ListViewItem {Text = l.ReturnType};
item.SubItems.Add(l.Library + "."); item.SubItems.Add(l.Library + ".");
@ -42,16 +42,16 @@ namespace BizHawk.Client.EmuHawk
switch (column) switch (column)
{ {
case 0: //Return case 0: //Return
GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderByDescending(x => x.ReturnType).ToList(); GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderByDescending(x => x.ReturnType).ToList();
break; break;
case 1: //Library case 1: //Library
GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderByDescending(x => x.Library).ToList(); GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderByDescending(x => x.Library).ToList();
break; break;
case 2: //Name case 2: //Name
GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderByDescending(x => x.Name).ToList(); GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderByDescending(x => x.Name).ToList();
break; break;
case 3: //Parameters case 3: //Parameters
GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderByDescending(x => x.ParameterList).ToList(); GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderByDescending(x => x.ParameterList).ToList();
break; break;
} }
} }
@ -60,16 +60,16 @@ namespace BizHawk.Client.EmuHawk
switch (column) switch (column)
{ {
case 0: //Return case 0: //Return
GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderBy(x => x.ReturnType).ToList(); GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderBy(x => x.ReturnType).ToList();
break; break;
case 1: //Library case 1: //Library
GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderBy(x => x.Library).ToList(); GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderBy(x => x.Library).ToList();
break; break;
case 2: //Name case 2: //Name
GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderBy(x => x.Name).ToList(); GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderBy(x => x.Name).ToList();
break; break;
case 3: //Parameters case 3: //Parameters
GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderBy(x => x.ParameterList).ToList(); GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList.OrderBy(x => x.ParameterList).ToList();
break; break;
} }
} }
@ -133,7 +133,7 @@ namespace BizHawk.Client.EmuHawk
foreach (int index in indexes) foreach (int index in indexes)
{ {
var library_function = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.FunctionList[index]; var library_function = GlobalWin.Tools.LuaConsole.LuaImp.Docs.FunctionList[index];
sb.Append(library_function.Library).Append('.').Append(library_function.Name).Append("()\n"); sb.Append(library_function.Library).Append('.').Append(library_function.Name).Append("()\n");
} }

8
BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
View File

@ -32,7 +32,7 @@ namespace BizHawk.Client.EmuHawk
{ {
FunctionView.Items.Clear(); FunctionView.Items.Clear();
List<NamedLuaFunction> nlfs = GlobalWinF.Tools.LuaConsole.LuaImp.RegisteredFunctions.OrderBy(x => x.Event).ThenBy(x => x.Name).ToList(); List<NamedLuaFunction> nlfs = GlobalWin.Tools.LuaConsole.LuaImp.RegisteredFunctions.OrderBy(x => x.Event).ThenBy(x => x.Name).ToList();
foreach (NamedLuaFunction nlf in nlfs) foreach (NamedLuaFunction nlf in nlfs)
{ {
ListViewItem item = new ListViewItem { Text = nlf.Event }; ListViewItem item = new ListViewItem { Text = nlf.Event };
@ -57,7 +57,7 @@ namespace BizHawk.Client.EmuHawk
ListView.SelectedIndexCollection indexes = FunctionView.SelectedIndices; ListView.SelectedIndexCollection indexes = FunctionView.SelectedIndices;
if (indexes.Count > 0) if (indexes.Count > 0)
{ {
GlobalWinF.Tools.LuaConsole.LuaImp.RegisteredFunctions[indexes[0]].Call(); GlobalWin.Tools.LuaConsole.LuaImp.RegisteredFunctions[indexes[0]].Call();
} }
} }
@ -66,8 +66,8 @@ namespace BizHawk.Client.EmuHawk
ListView.SelectedIndexCollection indexes = FunctionView.SelectedIndices; ListView.SelectedIndexCollection indexes = FunctionView.SelectedIndices;
if (indexes.Count > 0) if (indexes.Count > 0)
{ {
NamedLuaFunction nlf = GlobalWinF.Tools.LuaConsole.LuaImp.RegisteredFunctions[indexes[0]]; NamedLuaFunction nlf = GlobalWin.Tools.LuaConsole.LuaImp.RegisteredFunctions[indexes[0]];
GlobalWinF.Tools.LuaConsole.LuaImp.RegisteredFunctions.Remove(nlf); GlobalWin.Tools.LuaConsole.LuaImp.RegisteredFunctions.Remove(nlf);
PopulateListView(); PopulateListView();
} }
} }

2
BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs
View File

@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk
public void CloseThis() public void CloseThis()
{ {
GlobalWinF.Tools.LuaConsole.LuaImp.WindowClosed(Handle); GlobalWin.Tools.LuaConsole.LuaImp.WindowClosed(Handle);
} }
public void DoLuaEvent(IntPtr handle) public void DoLuaEvent(IntPtr handle)

10
BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.cs
View File

@ -434,7 +434,7 @@ namespace BizHawk.Client.EmuHawk
private void GenerateLibraryRegex() private void GenerateLibraryRegex()
{ {
StringBuilder list = new StringBuilder(); StringBuilder list = new StringBuilder();
List<string> Libs = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.GetLibraryList(); List<string> Libs = GlobalWin.Tools.LuaConsole.LuaImp.Docs.GetLibraryList();
for (int i = 0; i < Libs.Count; i++) for (int i = 0; i < Libs.Count; i++)
{ {
list.Append(Libs[i]); list.Append(Libs[i]);
@ -577,9 +577,9 @@ namespace BizHawk.Client.EmuHawk
} }
sfd.Filter = "Watch Files (*.lua)|*.lua|All Files|*.*"; sfd.Filter = "Watch Files (*.lua)|*.lua|All Files|*.*";
sfd.RestoreDirectory = true; sfd.RestoreDirectory = true;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return null; return null;
var file = new FileInfo(sfd.FileName); var file = new FileInfo(sfd.FileName);
@ -659,7 +659,7 @@ namespace BizHawk.Client.EmuHawk
string currentword = CurrentWord(); string currentword = CurrentWord();
if (IsLibraryWord(currentword)) if (IsLibraryWord(currentword))
{ {
List<string> libfunctions = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.GetFunctionsByLibrary(currentword); List<string> libfunctions = GlobalWin.Tools.LuaConsole.LuaImp.Docs.GetFunctionsByLibrary(currentword);
// Position autocomplete box near the cursor's current position // Position autocomplete box near the cursor's current position
int x = LuaText.GetPositionFromCharIndex(LuaText.SelectionStart).X + LuaText.Location.X + 5; int x = LuaText.GetPositionFromCharIndex(LuaText.SelectionStart).X + LuaText.Location.X + 5;
@ -783,7 +783,7 @@ namespace BizHawk.Client.EmuHawk
private bool IsLibraryWord(string word) private bool IsLibraryWord(string word)
{ {
List<string> Libs = GlobalWinF.Tools.LuaConsole.LuaImp.Docs.GetLibraryList(); List<string> Libs = GlobalWin.Tools.LuaConsole.LuaImp.Docs.GetLibraryList();
if (Libs.Contains(word)) if (Libs.Contains(word))
{ {
return true; return true;

2
BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.cs
View File

@ -40,7 +40,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.N64VideoSizeX = Int32.Parse(strArr[0].Trim()); Global.Config.N64VideoSizeX = Int32.Parse(strArr[0].Trim());
Global.Config.N64VideoSizeY = Int32.Parse(strArr[1].Trim()); Global.Config.N64VideoSizeY = Int32.Parse(strArr[1].Trim());
Global.Config.N64VidPlugin = PluginComboBox.Text; Global.Config.N64VidPlugin = PluginComboBox.Text;
GlobalWinF.MainForm.FlagNeedsReboot(); //TODO: this won't always be necessary, keep that in mind GlobalWin.MainForm.FlagNeedsReboot(); //TODO: this won't always be necessary, keep that in mind
//Rice //Rice
Global.Config.RicePlugin.NormalAlphaBlender = RiceNormalAlphaBlender_CB.Checked; Global.Config.RicePlugin.NormalAlphaBlender = RiceNormalAlphaBlender_CB.Checked;

4
BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.cs
View File

@ -76,7 +76,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Global.Config.NESPaletteFile = palette.Name; Global.Config.NESPaletteFile = palette.Name;
nes.SetPalette(NES.Palettes.Load_FCEUX_Palette(HawkFile.ReadAllBytes(palette.Name))); nes.SetPalette(NES.Palettes.Load_FCEUX_Palette(HawkFile.ReadAllBytes(palette.Name)));
GlobalWinF.OSD.AddMessage("Palette file loaded: " + palette.Name); GlobalWin.OSD.AddMessage("Palette file loaded: " + palette.Name);
} }
} }
} }
@ -84,7 +84,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Global.Config.NESPaletteFile = ""; Global.Config.NESPaletteFile = "";
nes.SetPalette(NES.Palettes.FCEUX_Standard); nes.SetPalette(NES.Palettes.FCEUX_Standard);
GlobalWinF.OSD.AddMessage("Standard Palette set"); GlobalWin.OSD.AddMessage("Standard Palette set");
} }
Global.Config.NTSC_NESTopLine = (int)NTSC_FirstLineNumeric.Value; Global.Config.NTSC_NESTopLine = (int)NTSC_FirstLineNumeric.Value;

12
BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.cs
View File

@ -65,7 +65,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.NESTriangle = tr; Global.Config.NESTriangle = tr;
Global.Config.NESNoise = no; Global.Config.NESNoise = no;
Global.Config.NESDMC = dmc; Global.Config.NESDMC = dmc;
GlobalWinF.MainForm.SetNESSoundChannels(); GlobalWin.MainForm.SetNESSoundChannels();
Close(); Close();
} }
@ -73,35 +73,35 @@ namespace BizHawk.Client.EmuHawk
{ {
label6.Text = trackBar1.Value.ToString(); label6.Text = trackBar1.Value.ToString();
Global.Config.NESSquare1 = trackBar1.Value; Global.Config.NESSquare1 = trackBar1.Value;
GlobalWinF.MainForm.SetNESSoundChannels(); GlobalWin.MainForm.SetNESSoundChannels();
} }
private void trackBar2_ValueChanged(object sender, EventArgs e) private void trackBar2_ValueChanged(object sender, EventArgs e)
{ {
label7.Text = trackBar2.Value.ToString(); label7.Text = trackBar2.Value.ToString();
Global.Config.NESSquare2 = trackBar2.Value; Global.Config.NESSquare2 = trackBar2.Value;
GlobalWinF.MainForm.SetNESSoundChannels(); GlobalWin.MainForm.SetNESSoundChannels();
} }
private void trackBar3_ValueChanged(object sender, EventArgs e) private void trackBar3_ValueChanged(object sender, EventArgs e)
{ {
label8.Text = trackBar3.Value.ToString(); label8.Text = trackBar3.Value.ToString();
Global.Config.NESTriangle = trackBar3.Value; Global.Config.NESTriangle = trackBar3.Value;
GlobalWinF.MainForm.SetNESSoundChannels(); GlobalWin.MainForm.SetNESSoundChannels();
} }
private void trackBar4_ValueChanged(object sender, EventArgs e) private void trackBar4_ValueChanged(object sender, EventArgs e)
{ {
label9.Text = trackBar4.Value.ToString(); label9.Text = trackBar4.Value.ToString();
Global.Config.NESNoise = trackBar4.Value; Global.Config.NESNoise = trackBar4.Value;
GlobalWinF.MainForm.SetNESSoundChannels(); GlobalWin.MainForm.SetNESSoundChannels();
} }
private void trackBar5_ValueChanged(object sender, EventArgs e) private void trackBar5_ValueChanged(object sender, EventArgs e)
{ {
label10.Text = trackBar5.Value.ToString(); label10.Text = trackBar5.Value.ToString();
Global.Config.NESDMC = trackBar5.Value; Global.Config.NESDMC = trackBar5.Value;
GlobalWinF.MainForm.SetNESSoundChannels(); GlobalWin.MainForm.SetNESSoundChannels();
} }
} }
} }

4
BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs
View File

@ -76,9 +76,9 @@ namespace BizHawk.Client.EmuHawk
RestoreDirectory = true RestoreDirectory = true
}; };
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
{ {
return; return;

4
BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs
View File

@ -83,9 +83,9 @@ namespace BizHawk.Client.EmuHawk
RestoreDirectory = true RestoreDirectory = true
}; };
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return; return;

4
BizHawk.Client.EmuHawk/tools/NES/PatternViewer.cs
View File

@ -44,9 +44,9 @@ namespace BizHawk.Client.EmuHawk
RestoreDirectory = true RestoreDirectory = true
}; };
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return; return;

4
BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs
View File

@ -49,9 +49,9 @@ namespace BizHawk.Client.EmuHawk
RestoreDirectory = true RestoreDirectory = true
}; };
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return; return;

2
BizHawk.Client.EmuHawk/tools/StateVisualizer.cs
View File

@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk
string path = PathManager.SaveStatePrefix(Global.Game) + "." + name + ".State"; string path = PathManager.SaveStatePrefix(Global.Game) + "." + name + ".State";
if (File.Exists(path)) if (File.Exists(path))
{ {
Movie m = new Movie(GlobalWinF.MainForm.GetEmuVersion()); Movie m = new Movie(GlobalWin.MainForm.GetEmuVersion());
LoadLogFromSavestateText(m, path); LoadLogFromSavestateText(m, path);
AddLog(m.LogDump, i); AddLog(m.LogDump, i);
} }

46
BizHawk.Client.EmuHawk/tools/TAStudio.cs
View File

@ -84,7 +84,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.Emulator.Frame < stopOnFrame) if (Global.Emulator.Frame < stopOnFrame)
{ {
GlobalWinF.MainForm.PressFrameAdvance = true; GlobalWin.MainForm.PressFrameAdvance = true;
} }
} }
@ -156,9 +156,9 @@ namespace BizHawk.Client.EmuHawk
{ {
//TODO: don't engage until new/open project //TODO: don't engage until new/open project
// //
GlobalWinF.MainForm.PauseEmulator(); GlobalWin.MainForm.PauseEmulator();
Engaged = true; Engaged = true;
GlobalWinF.OSD.AddMessage("TAStudio engaged"); GlobalWin.OSD.AddMessage("TAStudio engaged");
if (Global.MovieSession.Movie.IsActive) if (Global.MovieSession.Movie.IsActive)
{ {
Global.MovieSession.Movie.StateCapturing = true; Global.MovieSession.Movie.StateCapturing = true;
@ -238,13 +238,13 @@ namespace BizHawk.Client.EmuHawk
private void StopButton_Click(object sender, EventArgs e) private void StopButton_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.StopMovie(); GlobalWin.MainForm.StopMovie();
Restart(); Restart();
} }
private void FrameAdvanceButton_Click(object sender, EventArgs e) private void FrameAdvanceButton_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.PressFrameAdvance = true; GlobalWin.MainForm.PressFrameAdvance = true;
} }
private void RewindButton_Click(object sender, EventArgs e) private void RewindButton_Click(object sender, EventArgs e)
@ -252,7 +252,7 @@ namespace BizHawk.Client.EmuHawk
stopOnFrame = 0; stopOnFrame = 0;
if (Global.MovieSession.Movie.IsFinished || !Global.MovieSession.Movie.IsActive) if (Global.MovieSession.Movie.IsFinished || !Global.MovieSession.Movie.IsActive)
{ {
GlobalWinF.MainForm.Rewind(1); GlobalWin.MainForm.Rewind(1);
if (Global.Emulator.Frame <= Global.MovieSession.Movie.Frames) if (Global.Emulator.Frame <= Global.MovieSession.Movie.Frames)
{ {
Global.MovieSession.Movie.SwitchToPlay(); Global.MovieSession.Movie.SwitchToPlay();
@ -267,7 +267,7 @@ namespace BizHawk.Client.EmuHawk
private void PauseButton_Click(object sender, EventArgs e) private void PauseButton_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.TogglePause(); GlobalWin.MainForm.TogglePause();
} }
private void autoloadToolStripMenuItem_Click(object sender, EventArgs e) private void autoloadToolStripMenuItem_Click(object sender, EventArgs e)
@ -302,7 +302,7 @@ namespace BizHawk.Client.EmuHawk
private void RewindToBeginning_Click(object sender, EventArgs e) private void RewindToBeginning_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.Rewind(Global.Emulator.Frame); GlobalWin.MainForm.Rewind(Global.Emulator.Frame);
DisplayList(); DisplayList();
} }
@ -311,7 +311,7 @@ namespace BizHawk.Client.EmuHawk
//TODO: adelikat: I removed the stop on frame feature, so this will keep playing into movie finished mode, need to rebuild that functionality //TODO: adelikat: I removed the stop on frame feature, so this will keep playing into movie finished mode, need to rebuild that functionality
FastFowardToEnd.Checked ^= true; FastFowardToEnd.Checked ^= true;
GlobalWinF.MainForm.FastForward = FastFowardToEnd.Checked; GlobalWin.MainForm.FastForward = FastFowardToEnd.Checked;
if (FastFowardToEnd.Checked) if (FastFowardToEnd.Checked)
{ {
FastForward.Checked = false; FastForward.Checked = false;
@ -362,12 +362,12 @@ namespace BizHawk.Client.EmuHawk
private void newProjectToolStripMenuItem_Click(object sender, EventArgs e) private void newProjectToolStripMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.LoadRecordMovieDialog(); GlobalWin.MainForm.LoadRecordMovieDialog();
} }
private void openProjectToolStripMenuItem_Click(object sender, EventArgs e) private void openProjectToolStripMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.LoadPlayMovieDialog(); GlobalWin.MainForm.LoadPlayMovieDialog();
} }
private void saveProjectToolStripMenuItem_Click(object sender, EventArgs e) private void saveProjectToolStripMenuItem_Click(object sender, EventArgs e)
@ -389,7 +389,7 @@ namespace BizHawk.Client.EmuHawk
private void FastForward_Click(object sender, EventArgs e) private void FastForward_Click(object sender, EventArgs e)
{ {
FastForward.Checked ^= true; FastForward.Checked ^= true;
GlobalWinF.MainForm.FastForward = FastForward.Checked; GlobalWin.MainForm.FastForward = FastForward.Checked;
if (FastForward.Checked) if (FastForward.Checked)
{ {
TurboFastForward.Checked = false; TurboFastForward.Checked = false;
@ -399,7 +399,7 @@ namespace BizHawk.Client.EmuHawk
private void TurboFastForward_Click(object sender, EventArgs e) private void TurboFastForward_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.TurboFastForward ^= true; GlobalWin.MainForm.TurboFastForward ^= true;
TurboFastForward.Checked ^= true; TurboFastForward.Checked ^= true;
if (TurboFastForward.Checked) if (TurboFastForward.Checked)
{ {
@ -424,7 +424,7 @@ namespace BizHawk.Client.EmuHawk
{ {
RewindToFrame(Global.MovieSession.Movie.StateLastIndex); RewindToFrame(Global.MovieSession.Movie.StateLastIndex);
stopOnFrame = TASView.selectedItem; stopOnFrame = TASView.selectedItem;
GlobalWinF.MainForm.PressFrameAdvance = true; GlobalWin.MainForm.PressFrameAdvance = true;
} }
UpdateValues(); UpdateValues();
@ -451,9 +451,9 @@ namespace BizHawk.Client.EmuHawk
string filter = "Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|Savestates|*.state|All Files|*.*"; string filter = "Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|Savestates|*.state|All Files|*.*";
sfd.Filter = filter; sfd.Filter = filter;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
return sfd.FileName; return sfd.FileName;
@ -475,7 +475,7 @@ namespace BizHawk.Client.EmuHawk
} }
else if (e.Delta < 0) //Scroll down else if (e.Delta < 0) //Scroll down
{ {
GlobalWinF.MainForm.PressFrameAdvance = true; GlobalWin.MainForm.PressFrameAdvance = true;
} }
UpdateValues(); UpdateValues();
@ -548,7 +548,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.MovieSession.Movie.IsRecording) if (Global.MovieSession.Movie.IsRecording)
{ {
Global.MovieSession.Movie.StartPlayback(); Global.MovieSession.Movie.StartPlayback();
GlobalWinF.MainForm.RestoreReadWriteOnStop = true; GlobalWin.MainForm.RestoreReadWriteOnStop = true;
} }
} }
else else
@ -561,18 +561,18 @@ namespace BizHawk.Client.EmuHawk
{ {
//frame-1 because we need to go back an extra frame and then run a frame, otherwise the display doesn't get updated. //frame-1 because we need to go back an extra frame and then run a frame, otherwise the display doesn't get updated.
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.GetState(frame - 1)))); Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.GetState(frame - 1))));
GlobalWinF.MainForm.UpdateFrame = true; GlobalWin.MainForm.UpdateFrame = true;
} }
} }
} }
else if (frame <= Global.MovieSession.Movie.StateLastIndex) else if (frame <= Global.MovieSession.Movie.StateLastIndex)
{ {
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.GetState(frame - 1)))); Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.GetState(frame - 1))));
GlobalWinF.MainForm.UpdateFrame = true; GlobalWin.MainForm.UpdateFrame = true;
} }
else else
{ {
GlobalWinF.MainForm.UnpauseEmulator(); GlobalWin.MainForm.UnpauseEmulator();
} }
} }
@ -819,13 +819,13 @@ namespace BizHawk.Client.EmuHawk
{ {
if (e.Button == MouseButtons.Middle) if (e.Button == MouseButtons.Middle)
{ {
GlobalWinF.MainForm.TogglePause(); GlobalWin.MainForm.TogglePause();
} }
} }
private void TAStudio_KeyPress(object sender, KeyPressEventArgs e) private void TAStudio_KeyPress(object sender, KeyPressEventArgs e)
{ {
GlobalWinF.MainForm.ProcessInput(); GlobalWin.MainForm.ProcessInput();
} }
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)

36
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -19,8 +19,8 @@ namespace BizHawk.Client.EmuHawk
private void ToolBox_Load(object sender, EventArgs e) private void ToolBox_Load(object sender, EventArgs e)
{ {
int x = GlobalWinF.MainForm.Location.X + GlobalWinF.MainForm.Size.Width; int x = GlobalWin.MainForm.Location.X + GlobalWin.MainForm.Size.Width;
int y = GlobalWinF.MainForm.Location.Y; int y = GlobalWin.MainForm.Location.Y;
Location = new Point(x, y); Location = new Point(x, y);
HideShowIcons(); HideShowIcons();
} }
@ -91,88 +91,88 @@ namespace BizHawk.Client.EmuHawk
private void toolStripButton1_Click(object sender, EventArgs e) private void toolStripButton1_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<Cheats>(); GlobalWin.Tools.Load<Cheats>();
} }
private void toolStripButton2_Click(object sender, EventArgs e) private void toolStripButton2_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.LoadRamWatch(true); GlobalWin.MainForm.LoadRamWatch(true);
} }
private void toolStripButton3_Click(object sender, EventArgs e) private void toolStripButton3_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<RamSearch>(); GlobalWin.Tools.Load<RamSearch>();
} }
private void HexEditor_Click(object sender, EventArgs e) private void HexEditor_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<HexEditor>(); GlobalWin.Tools.Load<HexEditor>();
} }
private void toolStripButton5_Click(object sender, EventArgs e) private void toolStripButton5_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.OpenLuaConsole(); GlobalWin.MainForm.OpenLuaConsole();
} }
private void NESPPU_Click(object sender, EventArgs e) private void NESPPU_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<NESPPU>(); GlobalWin.Tools.Load<NESPPU>();
} }
private void NESDebugger_Click(object sender, EventArgs e) private void NESDebugger_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<NESDebugger>(); GlobalWin.Tools.Load<NESDebugger>();
} }
private void NESGameGenie_Click(object sender, EventArgs e) private void NESGameGenie_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.LoadGameGenieEC(); GlobalWin.MainForm.LoadGameGenieEC();
} }
private void NESNameTable_Click(object sender, EventArgs e) private void NESNameTable_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<NESNameTableViewer>(); GlobalWin.Tools.Load<NESNameTableViewer>();
} }
private void KeyPadTool_Click(object sender, EventArgs e) private void KeyPadTool_Click(object sender, EventArgs e)
{ {
if (Global.Emulator is TI83) if (Global.Emulator is TI83)
{ {
GlobalWinF.Tools.Load<TI83KeyPad>(); GlobalWin.Tools.Load<TI83KeyPad>();
} }
} }
private void TAStudioButton_Click(object sender, EventArgs e) private void TAStudioButton_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.LoadTAStudio(); GlobalWin.MainForm.LoadTAStudio();
} }
private void SNESGraphicsDebuggerButton_Click(object sender, EventArgs e) private void SNESGraphicsDebuggerButton_Click(object sender, EventArgs e)
{ {
if (Global.Emulator is LibsnesCore) if (Global.Emulator is LibsnesCore)
{ {
GlobalWinF.Tools.Load<SNESGraphicsDebugger>(); GlobalWin.Tools.Load<SNESGraphicsDebugger>();
} }
} }
private void VirtualPadButton_Click(object sender, EventArgs e) private void VirtualPadButton_Click(object sender, EventArgs e)
{ {
GlobalWinF.Tools.Load<VirtualPadForm>(); GlobalWin.Tools.Load<VirtualPadForm>();
} }
private void SNESGameGenie_Click(object sender, EventArgs e) private void SNESGameGenie_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.LoadGameGenieEC(); GlobalWin.MainForm.LoadGameGenieEC();
} }
private void GGGameGenie_Click(object sender, EventArgs e) private void GGGameGenie_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.LoadGameGenieEC(); GlobalWin.MainForm.LoadGameGenieEC();
} }
private void GBGameGenie_Click(object sender, EventArgs e) private void GBGameGenie_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.LoadGameGenieEC(); GlobalWin.MainForm.LoadGameGenieEC();
} }

36
BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
View File

@ -22,9 +22,9 @@ namespace BizHawk.Client.EmuHawk
ofd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*"; ofd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*";
ofd.RestoreDirectory = true; ofd.RestoreDirectory = true;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = ofd.ShowDialog(); var result = ofd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return null; return null;
var file = new FileInfo(ofd.FileName); var file = new FileInfo(ofd.FileName);
@ -51,9 +51,9 @@ namespace BizHawk.Client.EmuHawk
} }
sfd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*"; sfd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*";
sfd.RestoreDirectory = true; sfd.RestoreDirectory = true;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return null; return null;
var file = new FileInfo(sfd.FileName); var file = new FileInfo(sfd.FileName);
@ -71,9 +71,9 @@ namespace BizHawk.Client.EmuHawk
ofd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*"; ofd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*";
ofd.RestoreDirectory = true; ofd.RestoreDirectory = true;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = ofd.ShowDialog(); var result = ofd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
return null; return null;
var file = new FileInfo(ofd.FileName); var file = new FileInfo(ofd.FileName);
@ -94,9 +94,9 @@ namespace BizHawk.Client.EmuHawk
sfd.InitialDirectory = PathManager.GetCheatsPath(Global.Game); sfd.InitialDirectory = PathManager.GetCheatsPath(Global.Game);
sfd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*"; sfd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*";
sfd.RestoreDirectory = true; sfd.RestoreDirectory = true;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
{ {
return null; return null;
@ -145,14 +145,14 @@ namespace BizHawk.Client.EmuHawk
public static void HandleLoadError(RecentFiles recent, string path) public static void HandleLoadError(RecentFiles recent, string path)
{ {
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
DialogResult result = MessageBox.Show("Could not open " + path + "\nRemove from list?", "File not found", MessageBoxButtons.YesNo, MessageBoxIcon.Error); DialogResult result = MessageBox.Show("Could not open " + path + "\nRemove from list?", "File not found", MessageBoxButtons.YesNo, MessageBoxIcon.Error);
if (result == DialogResult.Yes) if (result == DialogResult.Yes)
{ {
recent.Remove(path); recent.Remove(path);
} }
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
} }
public static ToolStripMenuItem[] GenerateMemoryDomainMenuItems(Action<int> SetCallback, string SelectedDomain = "", int? maxSize = null) public static ToolStripMenuItem[] GenerateMemoryDomainMenuItems(Action<int> SetCallback, string SelectedDomain = "", int? maxSize = null)
@ -206,11 +206,11 @@ namespace BizHawk.Client.EmuHawk
public static void UpdateCheatRelatedTools() public static void UpdateCheatRelatedTools()
{ {
GlobalWinF.Tools.UpdateValues<RamWatch>(); GlobalWin.Tools.UpdateValues<RamWatch>();
GlobalWinF.Tools.UpdateValues<RamSearch>(); GlobalWin.Tools.UpdateValues<RamSearch>();
GlobalWinF.Tools.UpdateValues<HexEditor>(); GlobalWin.Tools.UpdateValues<HexEditor>();
GlobalWinF.Tools.UpdateValues<Cheats>(); GlobalWin.Tools.UpdateValues<Cheats>();
GlobalWinF.MainForm.UpdateCheatStatus(); GlobalWin.MainForm.UpdateCheatStatus();
} }
public static void UnfreezeAll() public static void UnfreezeAll()
@ -249,9 +249,9 @@ namespace BizHawk.Client.EmuHawk
public static void ViewInHexEditor(MemoryDomain domain, IEnumerable<int> addresses) public static void ViewInHexEditor(MemoryDomain domain, IEnumerable<int> addresses)
{ {
GlobalWinF.Tools.Load<HexEditor>(); GlobalWin.Tools.Load<HexEditor>();
GlobalWinF.Tools.HexEditor.SetDomain(domain); GlobalWin.Tools.HexEditor.SetDomain(domain);
GlobalWinF.Tools.HexEditor.SetToAddresses(addresses.ToList()); GlobalWin.Tools.HexEditor.SetToAddresses(addresses.ToList());
} }
public static MemoryDomain DomainByName(string name) public static MemoryDomain DomainByName(string name)

6
BizHawk.Client.EmuHawk/tools/TraceLogger.cs
View File

@ -323,10 +323,10 @@ namespace BizHawk.Client.EmuHawk
sfd.Filter = "Text Files (*.txt)|*.txt|Log Files (*.log)|*.log|All Files|*.*"; sfd.Filter = "Text Files (*.txt)|*.txt|Log Files (*.log)|*.log|All Files|*.*";
sfd.RestoreDirectory = true; sfd.RestoreDirectory = true;
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = sfd.ShowDialog(); var result = sfd.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result != DialogResult.OK) if (result != DialogResult.OK)
{ {
return null; return null;
@ -344,7 +344,7 @@ namespace BizHawk.Client.EmuHawk
if (file != null) if (file != null)
{ {
DumpListToDisk(file); DumpListToDisk(file);
GlobalWinF.OSD.AddMessage("Log dumped to " + file.FullName); GlobalWin.OSD.AddMessage("Log dumped to " + file.FullName);
} }
} }

4
BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadButton.cs
View File

@ -57,7 +57,7 @@ namespace BizHawk.Client.EmuHawk
protected void SetAutofireSticky() protected void SetAutofireSticky()
{ {
GlobalWinF.AutofireStickyXORAdapter.SetSticky(ControllerButton, Checked); GlobalWin.AutofireStickyXORAdapter.SetSticky(ControllerButton, Checked);
if (Checked == false) if (Checked == false)
{ {
@ -94,7 +94,7 @@ namespace BizHawk.Client.EmuHawk
_rightClicked = false; _rightClicked = false;
ForeColor = Color.Black; ForeColor = Color.Black;
Checked = false; Checked = false;
GlobalWinF.AutofireStickyXORAdapter.SetSticky(ControllerButton, false); GlobalWin.AutofireStickyXORAdapter.SetSticky(ControllerButton, false);
Global.StickyXORAdapter.SetSticky(ControllerButton, false); Global.StickyXORAdapter.SetSticky(ControllerButton, false);
} }
} }

16
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -816,10 +816,10 @@ namespace BizHawk.Client.EmuHawk
{ {
if (SelectedIndices.Count > 0) if (SelectedIndices.Count > 0)
{ {
GlobalWinF.MainForm.LoadRamWatch(true); GlobalWin.MainForm.LoadRamWatch(true);
for (int x = 0; x < SelectedIndices.Count; x++) for (int x = 0; x < SelectedIndices.Count; x++)
{ {
GlobalWinF.Tools.RamWatch.AddWatch(Searches[SelectedIndices[x]]); GlobalWin.Tools.RamWatch.AddWatch(Searches[SelectedIndices[x]]);
} }
if (Global.Config.RamSearchAlwaysExcludeRamWatch) if (Global.Config.RamSearchAlwaysExcludeRamWatch)
@ -838,7 +838,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (SelectedIndices.Count > 0) if (SelectedIndices.Count > 0)
{ {
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var poke = new RamPoke(); var poke = new RamPoke();
var watches = new List<Watch>(); var watches = new List<Watch>();
@ -851,15 +851,15 @@ namespace BizHawk.Client.EmuHawk
poke.InitialLocation = GetPromptPoint(); poke.InitialLocation = GetPromptPoint();
poke.ShowDialog(); poke.ShowDialog();
UpdateValues(); UpdateValues();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
} }
} }
private void RemoveRamWatchesFromList() private void RemoveRamWatchesFromList()
{ {
if (GlobalWinF.Tools.Has<RamWatch>()) if (GlobalWin.Tools.Has<RamWatch>())
{ {
Searches.RemoveRange(GlobalWinF.Tools.RamWatch.AddressList); Searches.RemoveRange(GlobalWin.Tools.RamWatch.AddressList);
WatchListView.ItemCount = Searches.Count; WatchListView.ItemCount = Searches.Count;
SetTotal(); SetTotal();
} }
@ -905,9 +905,9 @@ namespace BizHawk.Client.EmuHawk
InputPrompt i = new InputPrompt { Text = "Go to Address" }; InputPrompt i = new InputPrompt { Text = "Go to Address" };
i._Location = GetPromptPoint(); i._Location = GetPromptPoint();
i.SetMessage("Enter a hexadecimal value"); i.SetMessage("Enter a hexadecimal value");
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
i.ShowDialog(); i.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (i.UserOK) if (i.UserOK)
{ {

22
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -61,7 +61,7 @@ namespace BizHawk.Client.EmuHawk
for (int x = 0; x < Watches.Count; x++) for (int x = 0; x < Watches.Count; x++)
{ {
bool alert = Watches[x].IsSeparator ? false : Global.CheatList.IsActive(Watches[x].Domain, Watches[x].Address.Value); bool alert = Watches[x].IsSeparator ? false : Global.CheatList.IsActive(Watches[x].Domain, Watches[x].Address.Value);
GlobalWinF.OSD.AddGUIText( GlobalWin.OSD.AddGUIText(
Watches[x].ToString(), Watches[x].ToString(),
Global.Config.DispRamWatchx, Global.Config.DispRamWatchx,
(Global.Config.DispRamWatchy + (x * 14)), (Global.Config.DispRamWatchy + (x * 14)),
@ -160,9 +160,9 @@ namespace BizHawk.Client.EmuHawk
if (Watches.Changes) if (Watches.Changes)
{ {
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
DialogResult result = MessageBox.Show("Save Changes?", "Ram Watch", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3); DialogResult result = MessageBox.Show("Save Changes?", "Ram Watch", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3);
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result == DialogResult.Yes) if (result == DialogResult.Yes)
{ {
Watches.Save(); Watches.Save();
@ -514,9 +514,9 @@ namespace BizHawk.Client.EmuHawk
InitialLocation = GetPromptPoint() InitialLocation = GetPromptPoint()
}; };
we.SetWatch(Watches.Domain); we.SetWatch(Watches.Domain);
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
we.ShowDialog(); we.ShowDialog();
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (we.DialogResult == DialogResult.OK) if (we.DialogResult == DialogResult.OK)
{ {
@ -544,7 +544,7 @@ namespace BizHawk.Client.EmuHawk
} }
we.SetWatch(Watches.Domain, SelectedWatches, duplicate ? WatchEditor.Mode.Duplicate : WatchEditor.Mode.Edit); we.SetWatch(Watches.Domain, SelectedWatches, duplicate ? WatchEditor.Mode.Duplicate : WatchEditor.Mode.Edit);
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = we.ShowDialog(); var result = we.ShowDialog();
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
@ -563,7 +563,7 @@ namespace BizHawk.Client.EmuHawk
} }
} }
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
UpdateValues(); UpdateValues();
} }
} }
@ -582,13 +582,13 @@ namespace BizHawk.Client.EmuHawk
poke.SetWatch(SelectedWatches); poke.SetWatch(SelectedWatches);
} }
GlobalWinF.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = poke.ShowDialog(); var result = poke.ShowDialog();
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
UpdateValues(); UpdateValues();
} }
GlobalWinF.Sound.StartSound(); GlobalWin.Sound.StartSound();
} }
} }
@ -1037,7 +1037,7 @@ namespace BizHawk.Client.EmuHawk
if (!Global.Config.DisplayRamWatch) if (!Global.Config.DisplayRamWatch)
{ {
GlobalWinF.OSD.ClearGUIText(); GlobalWin.OSD.ClearGUIText();
} }
else else
{ {
@ -1154,7 +1154,7 @@ namespace BizHawk.Client.EmuHawk
var selected = SelectedWatches; var selected = SelectedWatches;
if (selected.Any()) if (selected.Any())
{ {
GlobalWinF.Tools.Load<HexEditor>(); GlobalWin.Tools.Load<HexEditor>();
if (selected.Select(x => x.Domain).Distinct().Count() > 1) if (selected.Select(x => x.Domain).Distinct().Count() > 1)
{ {