From 16bf63ade8bc2cb49013b390eaccb8dfdacb473e Mon Sep 17 00:00:00 2001 From: "J.D. Purcell" Date: Mon, 10 Apr 2017 09:35:40 -0400 Subject: [PATCH] Random cleanups. --- BizHawk.Client.EmuHawk/MainForm.cs | 62 +++++++++---------- BizHawk.Client.EmuHawk/config/RewindConfig.cs | 15 +---- BizHawk.Client.MultiHawk/Program.cs | 24 +++---- .../Consoles/Nintendo/NES/NES.BoardSystem.cs | 7 +-- 4 files changed, 44 insertions(+), 64 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 3c0773835c..b593389af0 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -977,7 +977,7 @@ namespace BizHawk.Client.EmuHawk public void TakeScreenshot(string path) { var fi = new FileInfo(path); - if (fi.Directory != null && fi.Directory.Exists == false) + if (fi.Directory != null && !fi.Directory.Exists) { fi.Directory.Create(); } @@ -1025,7 +1025,7 @@ namespace BizHawk.Client.EmuHawk PresentationPanel.Resized = true; // Is window off the screen at this size? - if (area.Contains(Bounds) == false) + if (!area.Contains(Bounds)) { if (Bounds.Right > area.Right) // Window is off the right edge { @@ -1079,7 +1079,7 @@ namespace BizHawk.Client.EmuHawk return; } - if (_inFullscreen == false) + if (!_inFullscreen) { SuspendLayout(); #if WINDOWS @@ -1418,49 +1418,47 @@ namespace BizHawk.Client.EmuHawk private void SetWindowText() { - string str = string.Empty; + string str = ""; if (_inResizeLoop) { var size = PresentationPanel.NativeSize; float AR = (float)size.Width / size.Height; - str = str + string.Format("({0}x{1})={2} - ", size.Width, size.Height, AR); + str += $"({size.Width}x{size.Height})={AR} - "; } //we need to display FPS somewhere, in this case if (Global.Config.DispSpeedupFeatures == 0) { - str = str + string.Format("({0:0} fps) -", _lastFps); + str += $"({_lastFps:0} fps) - "; } if (!string.IsNullOrEmpty(VersionInfo.CustomBuildString)) + { str += VersionInfo.CustomBuildString + " "; - - if (Emulator.IsNull()) - { - str = str + "BizHawk" + (VersionInfo.DeveloperBuild ? " (interim) " : string.Empty); } - else - { - str = str + Global.SystemInfo.DisplayName; - if (VersionInfo.DeveloperBuild) - { - str += " (interim)"; - } + str += Emulator.IsNull() ? "BizHawk" : Global.SystemInfo.DisplayName; + + if (VersionInfo.DeveloperBuild) + { + str += " (interim)"; + } + + if (!Emulator.IsNull()) + { + str += " - " + Global.Game.Name; if (Global.MovieSession.Movie.IsActive) { - str = str + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename); - } - else - { - str = str + " - " + Global.Game.Name; + str += " - " + Path.GetFileName(Global.MovieSession.Movie.Filename); } } if (!Global.Config.DispChrome_CaptionWindowed || _chromeless) + { str = ""; + } Text = str; } @@ -1598,7 +1596,7 @@ namespace BizHawk.Client.EmuHawk { var path = PathManager.SaveRamPath(Global.Game); var f = new FileInfo(path); - if (f.Directory != null && f.Directory.Exists == false) + if (f.Directory != null && !f.Directory.Exists) { f.Directory.Create(); } @@ -1934,7 +1932,7 @@ namespace BizHawk.Client.EmuHawk { int slot = Global.Config.SaveSlot; string emptypart = _stateSlots.HasSlot(slot) ? "" : " (empty)"; - string message = string.Format("Slot {0}{1} selected.", slot, emptypart); + string message = $"Slot {slot}{emptypart} selected."; GlobalWin.OSD.AddMessage(message); } @@ -2931,7 +2929,7 @@ namespace BizHawk.Client.EmuHawk _framesSinceLastFpsUpdate = 0; _timestampLastFpsUpdate = currentTimestamp; - var fps_string = string.Format("{0:0} fps", _lastFps); + var fps_string = $"{_lastFps:0} fps"; if (isRewinding) { fps_string += IsTurboing || isFastForwarding ? @@ -3010,7 +3008,7 @@ namespace BizHawk.Client.EmuHawk if (aw == null) { GlobalWin.OSD.AddMessage( - unattended ? string.Format("Couldn't start video writer \"{0}\"", videowritername) : "A/V capture canceled."); + unattended ? $"Couldn't start video writer \"{videowritername}\"" : "A/V capture canceled."); return; } @@ -3832,7 +3830,7 @@ namespace BizHawk.Client.EmuHawk } var path = PathManager.SaveStatePrefix(Global.Game) + "." + quickSlotName + ".State"; - if (File.Exists(path) == false) + if (!File.Exists(path)) { GlobalWin.OSD.AddMessage("Unable to load " + quickSlotName + ".State"); @@ -3897,7 +3895,7 @@ namespace BizHawk.Client.EmuHawk var path = PathManager.SaveStatePrefix(Global.Game) + "." + quickSlotName + ".State"; var file = new FileInfo(path); - if (file.Directory != null && file.Directory.Exists == false) + if (file.Directory != null && !file.Directory.Exists) { file.Directory.Create(); } @@ -3935,7 +3933,7 @@ namespace BizHawk.Client.EmuHawk var path = PathManager.GetSaveStatePath(Global.Game); var file = new FileInfo(path); - if (file.Directory != null && file.Directory.Exists == false) + if (file.Directory != null && !file.Directory.Exists) { file.Directory.Create(); } @@ -3985,7 +3983,7 @@ namespace BizHawk.Client.EmuHawk return; } - if (File.Exists(ofd.FileName) == false) + if (!File.Exists(ofd.FileName)) { return; } @@ -4230,8 +4228,8 @@ namespace BizHawk.Client.EmuHawk private void coreToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { - quickNESToolStripMenuItem.Checked = Global.Config.NES_InQuickNES == true; - nesHawkToolStripMenuItem.Checked = Global.Config.NES_InQuickNES == false; + quickNESToolStripMenuItem.Checked = Global.Config.NES_InQuickNES; + nesHawkToolStripMenuItem.Checked = !Global.Config.NES_InQuickNES; } private void allowGameDBCoreOverridesToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.Client.EmuHawk/config/RewindConfig.cs b/BizHawk.Client.EmuHawk/config/RewindConfig.cs index 6b1a246f37..2f7b0f8912 100644 --- a/BizHawk.Client.EmuHawk/config/RewindConfig.cs +++ b/BizHawk.Client.EmuHawk/config/RewindConfig.cs @@ -2,7 +2,6 @@ using System.Windows.Forms; using System.Drawing; -using BizHawk.Emulation.Common; using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; @@ -109,10 +108,9 @@ namespace BizHawk.Client.EmuHawk StateSizeLabel.Text = FormatKB(_stateSize); - SmallLabel1.Text = "Small savestates (less than " + (_mediumStateSize / 1024) + "KB)"; - MediumLabel1.Text = "Medium savestates (" + (_mediumStateSize / 1024) - + " - " + (_largeStateSize / 1024) + "KB)"; - LargeLabel1.Text = "Large savestates (" + (_largeStateSize / 1024) + "KB or more)"; + SmallLabel1.Text = $"Small savestates (less than {_mediumStateSize / 1024}KB)"; + MediumLabel1.Text = $"Medium savestates ({_mediumStateSize / 1024} - {_largeStateSize / 1024}KB)"; + LargeLabel1.Text = $"Large savestates ({_largeStateSize / 1024}KB or more)"; if (_stateSize >= _largeStateSize) { @@ -323,8 +321,6 @@ namespace BizHawk.Client.EmuHawk buffer_size *= 1024 * 1024; var est_frames = buffer_size / avg_state_size; - - long est_frequency = 0; switch (_stateSizeCategory) { @@ -371,11 +367,6 @@ namespace BizHawk.Client.EmuHawk CalculateEstimates(); } - private void trackBar1_ValueChanged(object sender, EventArgs e) - { - - } - private void nudCompression_ValueChanged(object sender, EventArgs e) { trackBarCompression.Value = (int)(sender as NumericUpDown).Value; diff --git a/BizHawk.Client.MultiHawk/Program.cs b/BizHawk.Client.MultiHawk/Program.cs index 7f026ec757..9ee5ddddc7 100644 --- a/BizHawk.Client.MultiHawk/Program.cs +++ b/BizHawk.Client.MultiHawk/Program.cs @@ -86,24 +86,18 @@ namespace BizHawk.Client.MultiHawk { mf.ProgramRunLoop(); } - catch (Exception e) + catch (Exception e) when (Global.MovieSession.Movie.IsActive) { -#if WINDOWS - if (Global.MovieSession.Movie.IsActive) + var result = MessageBox.Show( + "EmuHawk has thrown a fatal exception and is about to close.\nA movie has been detected. Would you like to try to save?\n(Note: Depending on what caused this error, this may or may not succeed)", + "Fatal error: " + e.GetType().Name, + MessageBoxButtons.YesNo, + MessageBoxIcon.Exclamation + ); + if (result == DialogResult.Yes) { - var result = MessageBox.Show( - "EmuHawk has thrown a fatal exception and is about to close.\nA movie has been detected. Would you like to try to save?\n(Note: Depending on what caused this error, this may or may not succeed)", - "Fatal error: " + e.GetType().Name, - MessageBoxButtons.YesNo, - MessageBoxIcon.Exclamation - ); - if (result == DialogResult.Yes) - { - Global.MovieSession.Movie.Save(); - } + Global.MovieSession.Movie.Save(); } -#endif - throw; } } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs index fdf0855b26..ce5c62bc3f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs @@ -778,12 +778,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { field.SetValue(board, Convert.ChangeType(Value, field.FieldType)); } - catch (Exception e) + catch (Exception e) when (e is InvalidCastException || e is FormatException || e is OverflowException) { - if (e is InvalidCastException || e is FormatException || e is OverflowException) - throw new InvalidDataException("Auto Mapper Properties were in a bad format!", e); - else - throw; + throw new InvalidDataException("Auto Mapper Properties were in a bad format!", e); } } break;