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

When converting a movie to a tasproj, properly capture whether it starts from savestate and make the appropriate marker

This commit is contained in:
adelikat 2014-10-25 15:47:15 +00:00
parent 3d30bd082e
commit c49e51d03f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
public static TasMovie ToTasMovie(this IMovie old) public static TasMovie ToTasMovie(this IMovie old)
{ {
var newFilename = old.Filename + "." + TasMovie.Extension; var newFilename = old.Filename + "." + TasMovie.Extension;
var tas = new TasMovie(newFilename); var tas = new TasMovie(newFilename, old.StartsFromSavestate);
for (var i = 0; i < old.InputLogLength; i++) for (var i = 0; i < old.InputLogLength; i++)
{ {

8
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -19,24 +19,24 @@ namespace BizHawk.Client.Common
public const string DefaultProjectName = "default"; public const string DefaultProjectName = "default";
public TasMovie(string path) : base(path) public TasMovie(string path, bool startsFromSavestate = false) : base(path)
{ {
// TODO: how to call the default constructor AND the base(path) constructor? And is base(path) calling base() ? // TODO: how to call the default constructor AND the base(path) constructor? And is base(path) calling base() ?
StateManager = new TasStateManager(this); StateManager = new TasStateManager(this);
Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0 Tasproj v1.0"; Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0 Tasproj v1.0";
Markers = new TasMovieMarkerList(this); Markers = new TasMovieMarkerList(this);
Markers.CollectionChanged += Markers_CollectionChanged; Markers.CollectionChanged += Markers_CollectionChanged;
Markers.Add(0, StartsFromSavestate ? "Savestate" : "Power on"); Markers.Add(0, startsFromSavestate ? "Savestate" : "Power on");
} }
public TasMovie() public TasMovie(bool startsFromSavestate = false)
: base() : base()
{ {
StateManager = new TasStateManager(this); StateManager = new TasStateManager(this);
Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0 Tasproj v1.0"; Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0 Tasproj v1.0";
Markers = new TasMovieMarkerList(this); Markers = new TasMovieMarkerList(this);
Markers.CollectionChanged += Markers_CollectionChanged; Markers.CollectionChanged += Markers_CollectionChanged;
Markers.Add(0, StartsFromSavestate ? "Savestate" : "Power on"); Markers.Add(0, startsFromSavestate ? "Savestate" : "Power on");
} }
public override string PreferredExtension public override string PreferredExtension