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

Implement Play Movie from beginning, add author & rerecord header params to file reading/writing code.

This commit is contained in:
andres.delikat 2011-05-12 21:00:04 +00:00
parent 67ae0cae5e
commit ca457d4ce3
4 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -149,7 +149,11 @@ namespace BizHawk.MultiClient
private void playFromBeginningToolStripMenuItem_Click(object sender, EventArgs e) private void playFromBeginningToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (InputLog.GetMovieMode() != MOVIEMODE.INACTIVE)
{
LoadRom(CurrentlyOpenRom);
UserMovie.StartPlayback();
}
} }

21
BizHawk.MultiClient/MainForm.cs
View File

@ -1067,10 +1067,25 @@ namespace BizHawk.MultiClient
var reader = new StreamReader(path); var reader = new StreamReader(path);
Global.Emulator.LoadStateText(reader); Global.Emulator.LoadStateText(reader);
//TODO: more logic regarding each movie mode //TODO: more logic regarding each movie mode
if (InputLog.GetMovieMode() == MOVIEMODE.RECORD) if (UserMovie.GetMovieMode() != MOVIEMODE.INACTIVE)
InputLog.LoadLogFromSavestateText(reader); {
reader.Close(); if (UserMovie.GetMovieMode() == MOVIEMODE.RECORD)
{
UserMovie.LoadLogFromSavestateText(reader);
UserMovie.
}
}
else
{
if (InputLog.GetMovieMode() == MOVIEMODE.RECORD)
InputLog.LoadLogFromSavestateText(reader);
}
reader.Close();
Global.RenderPanel.AddMessage("Loaded state: " + name); Global.RenderPanel.AddMessage("Loaded state: " + name);
} }

26
BizHawk.MultiClient/movie/Movie.cs
View File

@ -175,6 +175,16 @@ namespace BizHawk.MultiClient
str = ParseHeader(str, MovieHeader.GAMENAME); str = ParseHeader(str, MovieHeader.GAMENAME);
Header.AddHeaderLine(MovieHeader.GAMENAME, str); Header.AddHeaderLine(MovieHeader.GAMENAME, str);
} }
else if (str.Contains(MovieHeader.RERECORDS))
{
str = ParseHeader(str, MovieHeader.RERECORDS);
Header.AddHeaderLine(MovieHeader.RERECORDS, str);
}
else if (str.Contains(MovieHeader.AUTHOR))
{
str = ParseHeader(str, MovieHeader.AUTHOR);
Header.AddHeaderLine(MovieHeader.AUTHOR, str);
}
else if (str[0] == '|') else if (str[0] == '|')
{ {
Log.AddFrame(str); Log.AddFrame(str);
@ -212,6 +222,7 @@ namespace BizHawk.MultiClient
{ {
continue; continue;
} }
//TODO: don't reiterate this entire if chain, make a function called by this and loadmovie
else if (str.Contains(MovieHeader.EMULATIONVERSION)) else if (str.Contains(MovieHeader.EMULATIONVERSION))
{ {
str = ParseHeader(str, MovieHeader.EMULATIONVERSION); str = ParseHeader(str, MovieHeader.EMULATIONVERSION);
@ -232,6 +243,16 @@ namespace BizHawk.MultiClient
str = ParseHeader(str, MovieHeader.GAMENAME); str = ParseHeader(str, MovieHeader.GAMENAME);
Header.AddHeaderLine(MovieHeader.GAMENAME, str); Header.AddHeaderLine(MovieHeader.GAMENAME, str);
} }
else if (str.Contains(MovieHeader.RERECORDS))
{
str = ParseHeader(str, MovieHeader.RERECORDS);
Header.AddHeaderLine(MovieHeader.RERECORDS, str);
}
else if (str.Contains(MovieHeader.AUTHOR))
{
str = ParseHeader(str, MovieHeader.AUTHOR);
Header.AddHeaderLine(MovieHeader.AUTHOR, str);
}
else if (str[0] == '|') else if (str[0] == '|')
{ {
break; break;
@ -287,5 +308,10 @@ namespace BizHawk.MultiClient
Log.AddFrame(line); Log.AddFrame(line);
} }
} }
public void IncrementRerecordCount()
{
rerecordCount++;
}
} }
} }

5
BizHawk.MultiClient/movie/MovieHeader.cs
View File

@ -59,6 +59,11 @@ namespace BizHawk.MultiClient
HeaderParams.Add(key, value); HeaderParams.Add(key, value);
} }
public void UpdateRerecordCount(int count)
{
//TODO
}
public bool RemoveHeaderLine(string key) public bool RemoveHeaderLine(string key)
{ {
return HeaderParams.Remove(key); return HeaderParams.Remove(key);