some misc cleanups
This commit is contained in:
parent
6b249c648d
commit
290de71b71
|
@ -37,13 +37,7 @@ namespace BizHawk.Client.Common
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the file extension for the default movie implementation used in the client
|
/// Gets the file extension for the default movie implementation used in the client
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string DefaultExtension
|
public static string DefaultExtension => "bk2";
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return "bk2";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a list of extensions for all <seealso cref="IMovie"/> implementations
|
/// Gets a list of extensions for all <seealso cref="IMovie"/> implementations
|
||||||
|
|
|
@ -8,7 +8,6 @@ namespace BizHawk.Client.Common
|
||||||
{
|
{
|
||||||
public TasMovieChangeLog(TasMovie movie)
|
public TasMovieChangeLog(TasMovie movie)
|
||||||
{
|
{
|
||||||
_history = new List<List<IMovieAction>>();
|
|
||||||
_movie = movie;
|
_movie = movie;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ namespace BizHawk.Client.Common
|
||||||
|
|
||||||
if (obj is TasMovieMarker)
|
if (obj is TasMovieMarker)
|
||||||
{
|
{
|
||||||
return Frame == (obj as TasMovieMarker).Frame;
|
return Frame == ((TasMovieMarker)obj).Frame;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -59,13 +59,21 @@ namespace BizHawk.Client.Common
|
||||||
|
|
||||||
public static bool operator ==(TasMovieMarker marker, int frame)
|
public static bool operator ==(TasMovieMarker marker, int frame)
|
||||||
{
|
{
|
||||||
// TODO: account for null marker
|
if (marker == null)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return marker.Frame == frame;
|
return marker.Frame == frame;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool operator !=(TasMovieMarker marker, int frame)
|
public static bool operator !=(TasMovieMarker marker, int frame)
|
||||||
{
|
{
|
||||||
// TODO: account for null marker
|
if (marker == null)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return marker.Frame != frame;
|
return marker.Frame != frame;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
public bool? Lagged { get; set; }
|
public bool? Lagged { get; set; }
|
||||||
public bool? WasLagged { get; set; }
|
public bool? WasLagged { get; set; }
|
||||||
public string LogEntry { get; set; }
|
public string LogEntry { get; set; }
|
||||||
|
|
||||||
public bool HasState { get; set; }
|
public bool HasState { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue