diff --git a/BizHawk.Client.Common/SystemInfo.cs b/BizHawk.Client.Common/SystemInfo.cs index c78fb32187..418c98e050 100644 --- a/BizHawk.Client.Common/SystemInfo.cs +++ b/BizHawk.Client.Common/SystemInfo.cs @@ -8,17 +8,11 @@ namespace BizHawk.Client.Common /// public sealed class SystemInfo { - #region Fields - private const JoypadButton UpDownLeftRight = JoypadButton.Up | JoypadButton.Down | JoypadButton.Left | JoypadButton.Right; private const JoypadButton StandardButtons = JoypadButton.A | JoypadButton.B | JoypadButton.Start | JoypadButton.Select | UpDownLeftRight; private static readonly List AllSystemInfos = new List(); - #endregion - - #region cTor(s) - /// /// Initializes a new instance of the class /// @@ -36,8 +30,6 @@ namespace BizHawk.Client.Common AllSystemInfos.Add(this); } - #endregion - #region Methods #region Get SystemInfo @@ -268,23 +260,11 @@ namespace BizHawk.Client.Common return base.Equals(obj); } - /// - /// Gets the hashcode for current instance - /// - /// This instance hashcode - public override int GetHashCode() - { - return base.GetHashCode(); - } - /// /// Returns a representation of current /// In fact, return the same as DisplayName property /// - public override string ToString() - { - return DisplayName; - } + public override string ToString() => DisplayName; /// /// Determine if two are equals. diff --git a/BizHawk.Client.Common/movie/import/FcmImport.cs b/BizHawk.Client.Common/movie/import/FcmImport.cs index 537e435692..42568e404a 100644 --- a/BizHawk.Client.Common/movie/import/FcmImport.cs +++ b/BizHawk.Client.Common/movie/import/FcmImport.cs @@ -108,7 +108,7 @@ namespace BizHawk.Client.Common.movie.import // 020 16-byte md5sum of the ROM used byte[] md5 = r.ReadBytes(16); - Result.Movie.HeaderEntries[MD5] = md5.BytesToHexString().ToLower(); + Result.Movie.HeaderEntries[Md5] = md5.BytesToHexString().ToLower(); // 030 4-byte little-endian unsigned int: version of the emulator used uint emuVersion = r.ReadUInt32(); diff --git a/BizHawk.Client.Common/movie/import/Fm2Import.cs b/BizHawk.Client.Common/movie/import/Fm2Import.cs index a971b437fa..d462ff0f90 100644 --- a/BizHawk.Client.Common/movie/import/Fm2Import.cs +++ b/BizHawk.Client.Common/movie/import/Fm2Import.cs @@ -85,7 +85,7 @@ namespace BizHawk.Client.Common byte[] md5 = DecodeBlob(blob); if (md5 != null && md5.Length == 16) { - Result.Movie.HeaderEntries[MD5] = md5.BytesToHexString().ToLower(); + Result.Movie.HeaderEntries[Md5] = md5.BytesToHexString().ToLower(); } else { diff --git a/BizHawk.Client.Common/movie/import/IMovieImport.cs b/BizHawk.Client.Common/movie/import/IMovieImport.cs index 49dfebbb88..d32cd5d98c 100644 --- a/BizHawk.Client.Common/movie/import/IMovieImport.cs +++ b/BizHawk.Client.Common/movie/import/IMovieImport.cs @@ -13,7 +13,7 @@ namespace BizHawk.Client.Common internal abstract class MovieImporter : IMovieImport { protected const string EmulationOrigin = "emuOrigin"; - protected const string MD5 = "MD5"; + protected const string Md5 = "MD5"; protected const string MovieOrigin = "MovieOrigin"; public ImportResult Import(string path) diff --git a/BizHawk.Client.Common/movie/import/MmvImport.cs b/BizHawk.Client.Common/movie/import/MmvImport.cs index 50bcb63e54..dca03161bd 100644 --- a/BizHawk.Client.Common/movie/import/MmvImport.cs +++ b/BizHawk.Client.Common/movie/import/MmvImport.cs @@ -91,7 +91,7 @@ namespace BizHawk.Client.Common.movie.import // 00e4-00f3: binary: rom MD5 digest byte[] md5 = r.ReadBytes(16); - Result.Movie.HeaderEntries[MD5] = md5.BytesToHexString().ToLower(); + Result.Movie.HeaderEntries[Md5] = md5.BytesToHexString().ToLower(); var ss = new SMS.SmsSyncSettings { diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs b/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs index 74a7d74be6..3a672bb5b1 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs @@ -32,15 +32,9 @@ namespace BizHawk.Client.Common public string Message { get; set; } - public override string ToString() - { - return Frame.ToString() + '\t' + Message; - } + public override string ToString() => Frame.ToString() + '\t' + Message; - public override int GetHashCode() - { - return Frame.GetHashCode(); - } + public override int GetHashCode() => Frame.GetHashCode(); public override bool Equals(object obj) { diff --git a/BizHawk.Client.Common/tools/CheatList.cs b/BizHawk.Client.Common/tools/CheatList.cs index 0bafbc3544..ff740184b5 100644 --- a/BizHawk.Client.Common/tools/CheatList.cs +++ b/BizHawk.Client.Common/tools/CheatList.cs @@ -114,7 +114,7 @@ namespace BizHawk.Client.Common cheat.Changed += CheatChanged; if (Contains(cheat)) { - _cheatList.Remove(Global.CheatList.FirstOrDefault(c => c.Domain == cheat.Domain && c.Address == cheat.Address)); + _cheatList.Remove(this.FirstOrDefault(c => c.Domain == cheat.Domain && c.Address == cheat.Address)); } _cheatList.Add(cheat); diff --git a/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs b/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs index 77b8c8111e..f8152107a9 100644 --- a/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs +++ b/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs @@ -87,10 +87,7 @@ namespace BizHawk.Client.Common /// /// Ignore that stuff /// - public override bool Poke(string value) - { - return false; - } + public override bool Poke(string value) => false; /// /// Ignore that stuff diff --git a/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs b/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs index a54d4e407e..228fb8215d 100644 --- a/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs +++ b/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs @@ -45,17 +45,17 @@ namespace BizHawk.Client.Common /// static WatchList() { - // Initialize mapping of columns to comparers for sorting. + // Initialize mapping of columns to comparer for sorting. WatchComparers = new Dictionary> { - { Address, new WatchAddressComparer() }, - { Value, new WatchValueComparer() }, - { Prev, new WatchPreviousValueComparer() }, - { ChangesCol, new WatchChangeCountComparer() }, - { Diff, new WatchValueDifferenceComparer() }, - { Type, new WatchFullDisplayTypeComparer() }, - { Domain, new WatchDomainComparer() }, - { Notes, new WatchNoteComparer() } + [Address] = new WatchAddressComparer(), + [Value] = new WatchValueComparer(), + [Prev] = new WatchPreviousValueComparer(), + [ChangesCol] = new WatchChangeCountComparer(), + [Diff] = new WatchValueDifferenceComparer(), + [Type] = new WatchFullDisplayTypeComparer(), + [Domain] = new WatchDomainComparer(), + [Notes] = new WatchNoteComparer() }; } @@ -410,114 +410,111 @@ namespace BizHawk.Client.Common } var isBizHawkWatch = true; // Hack to support .wch files from other emulators - using (var sr = file.OpenText()) - { - string line; + using var sr = file.OpenText(); + string line; - if (!append) + if (!append) + { + Clear(); + } + + while ((line = sr.ReadLine()) != null) + { + // .wch files from other emulators start with a number representing the number of watch, that line can be discarded here + // Any properly formatted line couldn't possibly be this short anyway, this also takes care of any garbage lines that might be in a file + if (line.Length < 5) { - Clear(); + isBizHawkWatch = false; + continue; } - while ((line = sr.ReadLine()) != null) + if (line.Length >= 6 && line.Substring(0, 6) == "Domain") { - // .wch files from other emulators start with a number representing the number of watch, that line can be discarded here - // Any properly formatted line couldn't possibly be this short anyway, this also takes care of any garbage lines that might be in a file - if (line.Length < 5) - { - isBizHawkWatch = false; - continue; - } + isBizHawkWatch = true; + } - if (line.Length >= 6 && line.Substring(0, 6) == "Domain") - { - isBizHawkWatch = true; - } + if (line.Length >= 8 && line.Substring(0, 8) == "SystemID") + { + continue; + } - if (line.Length >= 8 && line.Substring(0, 8) == "SystemID") + var numColumns = line.HowMany('\t'); + int startIndex; + if (numColumns == 5) + { + // If 5, then this is a post 1.0.5 .wch file + if (isBizHawkWatch) { - continue; - } - - var numColumns = line.HowMany('\t'); - int startIndex; - if (numColumns == 5) - { - // If 5, then this is a post 1.0.5 .wch file - if (isBizHawkWatch) - { - // Do nothing here - } - else - { - startIndex = line.IndexOf('\t') + 1; - line = line.Substring(startIndex, line.Length - startIndex); // 5 digit value representing the watch position number - } + // Do nothing here } else - { - continue; // If not 4, something is wrong with this line, ignore it - } - - // Temporary, rename if kept - int addr; - var memDomain = _memoryDomains.MainMemory; - - var temp = line.Substring(0, line.IndexOf('\t')); - try - { - addr = int.Parse(temp, NumberStyles.HexNumber); - } - catch - { - continue; - } - - startIndex = line.IndexOf('\t') + 1; - line = line.Substring(startIndex, line.Length - startIndex); // Type - var size = Watch.SizeFromChar(line[0]); - - startIndex = line.IndexOf('\t') + 1; - line = line.Substring(startIndex, line.Length - startIndex); // Signed - var type = Watch.DisplayTypeFromChar(line[0]); - - startIndex = line.IndexOf('\t') + 1; - line = line.Substring(startIndex, line.Length - startIndex); // Endian - try - { - startIndex = short.Parse(line[0].ToString()); - } - catch - { - continue; - } - - var bigEndian = startIndex != 0; - - if (isBizHawkWatch) { startIndex = line.IndexOf('\t') + 1; - line = line.Substring(startIndex, line.Length - startIndex); // Domain - temp = line.Substring(0, line.IndexOf('\t')); - memDomain = _memoryDomains[temp] ?? _memoryDomains.MainMemory; + line = line.Substring(startIndex, line.Length - startIndex); // 5 digit value representing the watch position number } - - startIndex = line.IndexOf('\t') + 1; - var notes = line.Substring(startIndex, line.Length - startIndex); - - _watchList.Add( - Watch.GenerateWatch( - memDomain, - addr, - size, - type, - bigEndian, - notes)); + } + else + { + continue; // If not 4, something is wrong with this line, ignore it } - CurrentFileName = path; + // Temporary, rename if kept + int addr; + var memDomain = _memoryDomains.MainMemory; + + var temp = line.Substring(0, line.IndexOf('\t')); + try + { + addr = int.Parse(temp, NumberStyles.HexNumber); + } + catch + { + continue; + } + + startIndex = line.IndexOf('\t') + 1; + line = line.Substring(startIndex, line.Length - startIndex); // Type + var size = Watch.SizeFromChar(line[0]); + + startIndex = line.IndexOf('\t') + 1; + line = line.Substring(startIndex, line.Length - startIndex); // Signed + var type = Watch.DisplayTypeFromChar(line[0]); + + startIndex = line.IndexOf('\t') + 1; + line = line.Substring(startIndex, line.Length - startIndex); // Endian + try + { + startIndex = short.Parse(line[0].ToString()); + } + catch + { + continue; + } + + var bigEndian = startIndex != 0; + + if (isBizHawkWatch) + { + startIndex = line.IndexOf('\t') + 1; + line = line.Substring(startIndex, line.Length - startIndex); // Domain + temp = line.Substring(0, line.IndexOf('\t')); + memDomain = _memoryDomains[temp] ?? _memoryDomains.MainMemory; + } + + startIndex = line.IndexOf('\t') + 1; + var notes = line.Substring(startIndex, line.Length - startIndex); + + _watchList.Add( + Watch.GenerateWatch( + memDomain, + addr, + size, + type, + bigEndian, + notes)); } + CurrentFileName = path; Changes = append; return true;