diff --git a/BizHawk.Client.Common/movie/MovieService.cs b/BizHawk.Client.Common/movie/MovieService.cs
index 77ba5acce8..d0c7fde548 100644
--- a/BizHawk.Client.Common/movie/MovieService.cs
+++ b/BizHawk.Client.Common/movie/MovieService.cs
@@ -54,12 +54,7 @@ namespace BizHawk.Client.Common
public static bool IsValidMovieExtension(string ext)
{
- if (MovieExtensions.Contains(ext.ToLower().Replace(".", "")))
- {
- return true;
- }
-
- return false;
+ return MovieExtensions.Contains(ext.ToLower().Replace(".", ""));
}
///
diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 8aa3aa1efb..5598f75c63 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -7,7 +7,6 @@ using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Emulation.Cores.Nintendo.SNES9X;
using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Emulation.Cores.Nintendo.GBA;
-using BizHawk.Emulation.Cores.Atari.A7800Hawk;
namespace BizHawk.Client.Common
{
@@ -175,13 +174,6 @@ namespace BizHawk.Client.Common
ModeChangedCallback();
}
- // Movie Refactor TODO: delete me, any code calling this is poorly designed
- public bool MovieLoad()
- {
- MovieControllerAdapter = Movie.LogGeneratorInstance().MovieControllerAdapter;
- return Movie.Load(false);
- }
-
public void StopMovie(bool saveChanges = true)
{
var message = "Movie ";
@@ -276,7 +268,8 @@ namespace BizHawk.Client.Common
Movie.PokeFrame(Global.Emulator.Frame, Global.MovieOutputHardpoint);
}
else
- { // Why, this was already done?
+ {
+ // Why, this was already done?
LatchInputFromLog();
}
}
@@ -291,7 +284,7 @@ namespace BizHawk.Client.Common
private void HandleFrameLoopForRecordMode()
{
- // we don't want tasmovie to latch user input outside its internal recording mode, so limit it to autohold
+ // we don't want TasMovie to latch user input outside its internal recording mode, so limit it to autohold
if (Movie is TasMovie && Movie.IsPlaying)
{
MovieControllerAdapter.LatchSticky();
@@ -350,13 +343,11 @@ namespace BizHawk.Client.Common
}
else
{
- string errorMsg;
-
//// fixme: this is evil (it causes crashes in binary states because InflaterInputStream can't have its position set, even to zero.
////((StreamReader)reader).BaseStream.Position = 0;
////((StreamReader)reader).DiscardBufferedData();
// edit: zero 18-apr-2014 - this was solved by HackyStep1 and HackyStep2, so that the zip stream can be re-acquired instead of needing its position reset
- var result = Movie.ExtractInputLog(reader, out errorMsg);
+ var result = Movie.ExtractInputLog(reader, out var errorMsg);
if (!result)
{
Output(errorMsg);
@@ -478,7 +469,7 @@ namespace BizHawk.Client.Common
}
}
- // Note: this populates MovieControllerAdapter's Type with the approparite controller
+ // Note: this populates MovieControllerAdapter's Type with the appropriate controller
// Don't set it to a movie instance of the adapter or you will lose the definition!
InputManager.RewireInputChain();
@@ -532,7 +523,7 @@ namespace BizHawk.Client.Common
}
}
- if (record) // This is a hack really, we need to set the movie to its propert state so that it will be considered active later
+ if (record) // This is a hack really, we need to set the movie to its proper state so that it will be considered active later
{
movie.SwitchToRecord();
}
diff --git a/BizHawk.Client.Common/movie/MultitrackRecording.cs b/BizHawk.Client.Common/movie/MultitrackRecording.cs
index 37ef517a90..1669f12a3e 100644
--- a/BizHawk.Client.Common/movie/MultitrackRecording.cs
+++ b/BizHawk.Client.Common/movie/MultitrackRecording.cs
@@ -154,8 +154,7 @@ namespace BizHawk.Client.Common
return null;
}
- int player;
- if (!int.TryParse(parts[0].Substring(1), out player))
+ if (!int.TryParse(parts[0].Substring(1), out var player))
{
return null;
}
diff --git a/BizHawk.Client.Common/movie/Subtitle.cs b/BizHawk.Client.Common/movie/Subtitle.cs
index ffc3e847f7..42e0c7a37e 100644
--- a/BizHawk.Client.Common/movie/Subtitle.cs
+++ b/BizHawk.Client.Common/movie/Subtitle.cs
@@ -45,7 +45,7 @@ namespace BizHawk.Client.Common
return sb.ToString();
}
- public string ToSubRip(int index, double fps, bool addcolortag)
+ public string ToSubRip(int index, double fps, bool addColorTag)
{
var sb = new StringBuilder();
@@ -71,7 +71,7 @@ namespace BizHawk.Client.Common
// TODO: Positioning
// Color tag open
- if (addcolortag)
+ if (addColorTag)
{
uint rgb = Color & 0x00FFFFFF;
sb.Append("");
}
diff --git a/BizHawk.Client.Common/movie/SubtitleList.cs b/BizHawk.Client.Common/movie/SubtitleList.cs
index de62720e19..b317e91b5b 100644
--- a/BizHawk.Client.Common/movie/SubtitleList.cs
+++ b/BizHawk.Client.Common/movie/SubtitleList.cs
@@ -35,22 +35,22 @@ namespace BizHawk.Client.Common
{
try
{
- var subparts = subtitleStr.Split(' ');
+ var subParts = subtitleStr.Split(' ');
- // Unfortunately I made the file format space delminated so this hack is necessary to get the message
+ // Unfortunately I made the file format space delaminated so this hack is necessary to get the message
var message = "";
- for (var i = 6; i < subparts.Length; i++)
+ for (var i = 6; i < subParts.Length; i++)
{
- message += subparts[i] + ' ';
+ message += subParts[i] + ' ';
}
Add(new Subtitle
{
- Frame = int.Parse(subparts[1]),
- X = int.Parse(subparts[2]),
- Y = int.Parse(subparts[3]),
- Duration = int.Parse(subparts[4]),
- Color = uint.Parse(subparts[5], NumberStyles.HexNumber),
+ Frame = int.Parse(subParts[1]),
+ X = int.Parse(subParts[2]),
+ Y = int.Parse(subParts[3]),
+ Duration = int.Parse(subParts[4]),
+ Color = uint.Parse(subParts[5], NumberStyles.HexNumber),
Message = message.Trim()
});
@@ -84,12 +84,12 @@ namespace BizHawk.Client.Common
subs.Add(new Subtitle(subtitle));
}
- // absense of line wrap forces miltiline subtitle macros
+ // absence of line wrap forces multiline subtitle macros
// so we sort them just in case and optionally concat back to a single unit
// todo: instead of making this pretty, add the line wrap feature to subtitles
if (ConcatMultilines)
{
- int lastframe = 0;
+ int lastFrame = 0;
subs = subs.OrderBy(s => s.Frame).ThenBy(s => s.Y).ToList();
for (int i = 0;; i++)
@@ -101,19 +101,19 @@ namespace BizHawk.Client.Common
subs[i].Message = subs[i].Message.Trim();
- if (i > 0 && lastframe == subs[i].Frame)
+ if (i > 0 && lastFrame == subs[i].Frame)
{
subs[i].Message = $"{subs[i - 1].Message} {subs[i].Message}";
subs.Remove(subs[i - 1]);
i--;
}
- lastframe = subs[i].Frame;
+ lastFrame = subs[i].Frame;
}
}
else
{
- // srt stacks musltilines upwards
+ // srt stacks multilines upwards
subs = subs.OrderBy(s => s.Frame).ThenByDescending(s => s.Y).ToList();
}
diff --git a/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs b/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs
index fbcd18319f..42e1e6ccbd 100644
--- a/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs
+++ b/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs
@@ -73,11 +73,7 @@ namespace BizHawk.Client.Common
public ControllerDefinition Definition
{
- get
- {
- return _type;
- }
-
+ get => _type;
set
{
_type = new Bk2ControllerDefinition(value);
@@ -203,18 +199,10 @@ namespace BizHawk.Client.Common
public List> ControlsFromLog { private get; set; } = new List>();
- public override IEnumerable> ControlsOrdered
- {
- get
- {
- if (ControlsFromLog.Any())
- {
- return ControlsFromLog;
- }
-
- return base.ControlsOrdered;
- }
- }
+ public override IEnumerable> ControlsOrdered =>
+ ControlsFromLog.Any()
+ ? ControlsFromLog
+ : base.ControlsOrdered;
}
}
}
diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Header.cs b/BizHawk.Client.Common/movie/bk2/Bk2Header.cs
index aac0a3463b..30dd89379a 100644
--- a/BizHawk.Client.Common/movie/bk2/Bk2Header.cs
+++ b/BizHawk.Client.Common/movie/bk2/Bk2Header.cs
@@ -7,11 +7,7 @@ namespace BizHawk.Client.Common
{
public new string this[string key]
{
- get
- {
- return ContainsKey(key) ? base[key] : "";
- }
-
+ get => ContainsKey(key) ? base[key] : "";
set
{
if (ContainsKey(key))
diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
index c58b92289d..af811597b7 100644
--- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
+++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
@@ -35,11 +35,7 @@ namespace BizHawk.Client.Common
public string Filename
{
- get
- {
- return _filename;
- }
-
+ get => _filename;
set
{
_filename = value;
@@ -75,13 +71,7 @@ namespace BizHawk.Client.Common
}
}
- public int InputLogLength
- {
- get
- {
- return Log.Count;
- }
- }
+ public int InputLogLength => Log.Count;
public int TimeLength
{
diff --git a/BizHawk.Client.Common/movie/bk2/StringLogs.cs b/BizHawk.Client.Common/movie/bk2/StringLogs.cs
index 0473ba7cf6..b2a32559c7 100644
--- a/BizHawk.Client.Common/movie/bk2/StringLogs.cs
+++ b/BizHawk.Client.Common/movie/bk2/StringLogs.cs
@@ -89,7 +89,7 @@ namespace BizHawk.Client.Common
public IStringLog Clone()
{
- StreamStringLog ret = new StreamStringLog(_mDisk); // doesnt necessarily make sense to copy the mDisk value, they could be designated for different targets...
+ StreamStringLog ret = new StreamStringLog(_mDisk); // doesn't necessarily make sense to copy the mDisk value, they could be designated for different targets...
for (int i = 0; i < Count; i++)
{
ret.Add(this[i]);
diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
index 6fe710524f..0735b33bf2 100644
--- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
+++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
@@ -330,22 +330,22 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
}
}
- if (Global.Emulator is Gameboy && (Global.Emulator as Gameboy).IsCGBMode())
+ if (Global.Emulator is Gameboy && ((Gameboy) Global.Emulator).IsCGBMode())
{
movie.HeaderEntries.Add("IsCGBMode", "1");
}
- if (Global.Emulator is SMS && (Global.Emulator as SMS).IsSG1000)
+ if (Global.Emulator is SMS && ((SMS) Global.Emulator).IsSG1000)
{
movie.HeaderEntries.Add("IsSGMode", "1");
}
- if (Global.Emulator is SMS && (Global.Emulator as SMS).IsGameGear)
+ if (Global.Emulator is SMS && ((SMS) Global.Emulator).IsGameGear)
{
movie.HeaderEntries.Add("IsGGMode", "1");
}
- if (Global.Emulator is GPGX && (Global.Emulator as GPGX).IsMegaCD)
+ if (Global.Emulator is GPGX && ((GPGX) Global.Emulator).IsMegaCD)
{
movie.HeaderEntries.Add("IsSegaCDMode", "1");
}
diff --git a/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs b/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs
index 8457f75b48..7101dca7af 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs
@@ -85,8 +85,7 @@ namespace BizHawk.Client.Common
public bool? History(int frame)
{
- bool wasLag;
- var result = _wasLag.TryGetValue(frame, out wasLag);
+ var result = _wasLag.TryGetValue(frame, out var wasLag);
if (result)
{
return wasLag;
@@ -112,8 +111,7 @@ namespace BizHawk.Client.Common
private void RemoveLagEntry(int frame)
{
- bool lag;
- var result = _lagLog.TryGetValue(frame, out lag);
+ var result = _lagLog.TryGetValue(frame, out var lag);
if (result)
{
_wasLag[frame] = lag;
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs
index 54ee1b7e3a..fdcf9e0199 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs
@@ -23,11 +23,7 @@ namespace BizHawk.Client.Common
public int MaxSteps
{
- get
- {
- return _maxSteps;
- }
-
+ get => _maxSteps;
set
{
_maxSteps = value;
@@ -346,14 +342,9 @@ namespace BizHawk.Client.Common
{
if (IsRecording || force)
{
- if (oldPosition == -1)
- {
- name = $"Set Marker at frame {newMarker.Frame}";
- }
- else
- {
- name = $"Remove Marker at frame {oldPosition}";
- }
+ name = oldPosition == -1
+ ? $"Set Marker at frame {newMarker.Frame}"
+ : $"Remove Marker at frame {oldPosition}";
AddMovieAction(name);
_history.Last().Add(new MovieActionMarker(newMarker, oldPosition, oldMessage));
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs b/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs
index aae5a848d5..01d68e9f50 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs
@@ -49,9 +49,9 @@ namespace BizHawk.Client.Common
return false;
}
- if (obj is TasMovieMarker)
+ if (obj is TasMovieMarker marker)
{
- return Frame == ((TasMovieMarker)obj).Frame;
+ return Frame == marker.Frame;
}
return false;
diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 08891bb478..8eda444c1a 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -84,18 +84,10 @@ namespace BizHawk.Client.Common
? _states.Last().Key
: 0;
- private byte[] InitialState
- {
- get
- {
- if (_movie.StartsFromSavestate)
- {
- return _movie.BinarySavestate;
- }
-
- return _states[0];
- }
- }
+ private byte[] InitialState =>
+ _movie.StartsFromSavestate
+ ? _movie.BinarySavestate
+ : _states[0];
public bool Any()
{
diff --git a/BizHawk.Client.Common/tools/Cheat.cs b/BizHawk.Client.Common/tools/Cheat.cs
index 28ab738080..ac5ea63ad4 100644
--- a/BizHawk.Client.Common/tools/Cheat.cs
+++ b/BizHawk.Client.Common/tools/Cheat.cs
@@ -381,7 +381,7 @@ namespace BizHawk.Client.Common
}
public void SetType(DisplayType type)
- {
+ {
if (_watch.IsDiplayTypeAvailable(type))
{
_watch.Type = type;
diff --git a/BizHawk.Client.Common/tools/CheatList.cs b/BizHawk.Client.Common/tools/CheatList.cs
index 01702817df..0a857862ce 100644
--- a/BizHawk.Client.Common/tools/CheatList.cs
+++ b/BizHawk.Client.Common/tools/CheatList.cs
@@ -34,23 +34,13 @@ namespace BizHawk.Client.Common
public int Count => _cheatList.Count;
- public int CheatCount
- {
- get { return _cheatList.Count(c => !c.IsSeparator); }
- }
+ public int CheatCount => _cheatList.Count(c => !c.IsSeparator);
- public int ActiveCount
- {
- get { return _cheatList.Count(c => c.Enabled); }
- }
+ public int ActiveCount => _cheatList.Count(c => c.Enabled);
public bool Changes
{
- get
- {
- return _changes;
- }
-
+ get => _changes;
set
{
_changes = value;
@@ -67,13 +57,9 @@ namespace BizHawk.Client.Common
public Cheat this[int index] => _cheatList[index];
- public Cheat this[MemoryDomain domain, long address]
- {
- get
- {
- return _cheatList.FirstOrDefault(cheat => cheat.Domain == domain && cheat.Address == address);
- }
- }
+ public Cheat this[MemoryDomain domain, long address] =>
+ _cheatList.FirstOrDefault(cheat => cheat.Domain == domain && cheat.Address == address);
+
public IEnumerator GetEnumerator()
{
@@ -730,7 +716,7 @@ namespace BizHawk.Client.Common
Cheat = c;
}
- public Cheat Cheat { get; private set; }
+ public Cheat Cheat { get; }
}
}
}
diff --git a/BizHawk.Client.Common/tools/Watch/ByteWatch.cs b/BizHawk.Client.Common/tools/Watch/ByteWatch.cs
index f7cc79de01..7cf747df62 100644
--- a/BizHawk.Client.Common/tools/Watch/ByteWatch.cs
+++ b/BizHawk.Client.Common/tools/Watch/ByteWatch.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
-using BizHawk.Common.NumberExtensions;
using BizHawk.Common.StringExtensions;
using BizHawk.Emulation.Common;
diff --git a/BizHawk.Client.Common/tools/Watch/DWordWatch.cs b/BizHawk.Client.Common/tools/Watch/DWordWatch.cs
index 10ade39772..b485f94d8e 100644
--- a/BizHawk.Client.Common/tools/Watch/DWordWatch.cs
+++ b/BizHawk.Client.Common/tools/Watch/DWordWatch.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
-using BizHawk.Common.NumberExtensions;
using BizHawk.Common.StringExtensions;
using BizHawk.Emulation.Common;
diff --git a/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs b/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs
index 91153369e3..c0b5cf4d0b 100644
--- a/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs
+++ b/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs
@@ -21,13 +21,13 @@ namespace BizHawk.Client.Common
///
public static SeparatorWatch Instance => new SeparatorWatch();
- public static SeparatorWatch NewSeparatorWatch(string description)
- {
- return new SeparatorWatch
- {
- Notes = description
- };
- }
+ public static SeparatorWatch NewSeparatorWatch(string description)
+ {
+ return new SeparatorWatch
+ {
+ Notes = description
+ };
+ }
///
/// Get the appropriate DisplayType
@@ -70,26 +70,24 @@ namespace BizHawk.Client.Common
/// A well formatted string representation
public override string ToDisplayString()
{
- if (Notes == null || Notes == "")
- return "----";
- else
- return Notes;
+ return string.IsNullOrEmpty(Notes)
+ ? "----"
+ : Notes;
}
- ///
+ ///
/// Transforms the current instance into a string
///
/// A representation of the current
public override string ToString()
- {
- return $"0\tS\t_\t1\t\t{Notes.Trim('\r', '\n')}";
- //return $"{(Domain == null && Address == 0 ? "0" : Address.ToHexString((Domain?.Size ?? 0xFF - 1).NumHexDigits()))}\t{SizeAsChar}\t{TypeAsChar}\t{Convert.ToInt32(BigEndian)}\t{Domain?.Name}\t{Notes.Trim('\r', '\n')}";
- }
+ {
+ return $"0\tS\t_\t1\t\t{Notes.Trim('\r', '\n')}";
+ }
- ///
- /// Ignore that stuff
- ///
- public override bool Poke(string value)
+ ///
+ /// Ignore that stuff
+ ///
+ public override bool Poke(string value)
{
return false;
}
@@ -116,8 +114,6 @@ namespace BizHawk.Client.Common
///
public override void Update()
{
- //AddressString = (Notes == null || Notes == "") ? "" : Notes;
-
- }
+ }
}
}
diff --git a/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs b/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
index 96999aa9b1..6bd5fa2df0 100644
--- a/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
+++ b/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
@@ -40,7 +40,7 @@ namespace BizHawk.Client.Common
private static readonly WatchNoteComparer NoteComparer = new WatchNoteComparer();
private readonly List _watchList = new List(0);
- private readonly string _systemid;
+ private readonly string _systemId;
private IMemoryDomains _memoryDomains;
#endregion
@@ -52,11 +52,11 @@ namespace BizHawk.Client.Common
/// that will contains a set of
///
/// All available memory domains
- /// System identifier (NES, SNES, ...)
- public WatchList(IMemoryDomains core, string systemid)
+ /// System identifier (NES, SNES, ...)
+ public WatchList(IMemoryDomains core, string systemId)
{
_memoryDomains = core;
- _systemid = systemid;
+ _systemId = systemId;
}
#endregion
@@ -458,7 +458,7 @@ namespace BizHawk.Client.Common
using (var sw = new StreamWriter(CurrentFileName))
{
var sb = new StringBuilder();
- sb.Append("SystemID ").AppendLine(_systemid);
+ sb.Append("SystemID ").AppendLine(_systemId);
foreach (var watch in _watchList)
{
diff --git a/BizHawk.Client.Common/tools/Watch/WatchList/WatchNoteComparer.cs b/BizHawk.Client.Common/tools/Watch/WatchList/WatchNoteComparer.cs
index 621ae80bce..f24cbe37f4 100644
--- a/BizHawk.Client.Common/tools/Watch/WatchList/WatchNoteComparer.cs
+++ b/BizHawk.Client.Common/tools/Watch/WatchList/WatchNoteComparer.cs
@@ -30,21 +30,18 @@ namespace BizHawk.Client.Common
{
return 0;
}
- else if (string.Compare(x.Notes, y.Notes, true) == 0)
+
+ if (string.Compare(x.Notes, y.Notes, true) == 0)
{
if (x.Address.Equals(y.Address))
{
return x.Size.CompareTo(y.Size);
}
- else
- {
- return x.Address.CompareTo(y.Address);
- }
- }
- else
- {
- return string.Compare(x.Notes, y.Notes, true);
+
+ return x.Address.CompareTo(y.Address);
}
+
+ return string.Compare(x.Notes, y.Notes, true);
}
}
}
diff --git a/BizHawk.Client.Common/tools/Watch/WatchList/WatchValueComparer.cs b/BizHawk.Client.Common/tools/Watch/WatchList/WatchValueComparer.cs
index e00a52fd79..3e46ba86a3 100644
--- a/BizHawk.Client.Common/tools/Watch/WatchList/WatchValueComparer.cs
+++ b/BizHawk.Client.Common/tools/Watch/WatchList/WatchValueComparer.cs
@@ -51,21 +51,18 @@ namespace BizHawk.Client.Common
{
return 0;
}
- else if (xValue.Equals(yValue))
+
+ if (xValue.Equals(yValue))
{
if (x.Address.Equals(y.Address))
{
return x.Size.CompareTo(y.Size);
}
- else
- {
- return x.Address.CompareTo(y.Address);
- }
- }
- else
- {
- return xValue.CompareTo(yValue);
+
+ return x.Address.CompareTo(y.Address);
}
+
+ return xValue.CompareTo(yValue);
}
}
}
diff --git a/BizHawk.Client.Common/tools/Watch/WordWatch.cs b/BizHawk.Client.Common/tools/Watch/WordWatch.cs
index 51c16e68ea..76122a4749 100644
--- a/BizHawk.Client.Common/tools/Watch/WordWatch.cs
+++ b/BizHawk.Client.Common/tools/Watch/WordWatch.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
-using BizHawk.Common.NumberExtensions;
using BizHawk.Common.StringExtensions;
using BizHawk.Emulation.Common;
diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings
index 759dbd9b23..baf662f40f 100644
--- a/BizHawk.sln.DotSettings
+++ b/BizHawk.sln.DotSettings
@@ -199,6 +199,7 @@
True
True
True
+ True
True
True
True
@@ -206,6 +207,7 @@
True
True
True
+ True
True
True
True
@@ -226,6 +228,7 @@
True
True
True
+ True
True
True
True
@@ -235,6 +238,9 @@
True
True
True
+ True
+ True
+ True
True
True
True
@@ -247,15 +253,18 @@
True
True
True
+ True
True
True
True
True
+ True
True
True
True
True
True
+ True
True
True
True
@@ -268,7 +277,10 @@
True
True
True
+ True
+ True
True
+ True
True
True
True