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

Various tweaks related to movie code

This commit is contained in:
andres.delikat 2011-05-16 17:58:59 +00:00
parent 2331e12c9f
commit b9ec7e626e
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BizHawk.MultiClient/MainForm.cs
View File

@ -1128,10 +1128,12 @@ namespace BizHawk.MultiClient
{
UserMovie.WriteMovie();
UserMovie.StartPlayback();
Global.ActiveController.MovieMode = true;
//run loadstate-readonly function
}
else
{
Global.ActiveController.MovieMode = false;
UserMovie.LoadLogFromSavestateText(reader);
}
}
@ -1143,8 +1145,9 @@ namespace BizHawk.MultiClient
}
else
{
//switch to record mode
//LoadLogFromSavestateText()
UserMovie.StartNewRecording();
Global.ActiveController.MovieMode = false;
UserMovie.LoadLogFromSavestateText(reader);
}
}
else if (UserMovie.GetMovieMode() == MOVIEMODE.FINISHED)
@ -1798,6 +1801,12 @@ namespace BizHawk.MultiClient
readonlyToolStripMenuItem.Checked = true;
else
readonlyToolStripMenuItem.Checked = false;
readonlyToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.ReadOnlyToggleBinding;
recordMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.RecordMovieBinding;
playMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.PlayMovieBinding;
stopMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.StopMovieBinding;
playFromBeginningToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.PlayBeginningBinding;
}
public void ToggleReadOnly()

1
BizHawk.MultiClient/PlayMovie.Designer.cs generated
View File

@ -103,6 +103,7 @@
this.MovieView.UseCompatibleStateImageBehavior = false;
this.MovieView.View = System.Windows.Forms.View.Details;
this.MovieView.SelectedIndexChanged += new System.EventHandler(this.MovieView_SelectedIndexChanged);
this.MovieView.DoubleClick += new System.EventHandler(this.MovieView_DoubleClick);
//
// columnHeader1
//

13
BizHawk.MultiClient/PlayMovie.cs
View File

@ -54,9 +54,14 @@ namespace BizHawk.MultiClient
this.Close();
}
private void OK_Click(object sender, EventArgs e)
private void Run()
{
Global.MainForm.StartNewMovie(MovieList[MovieView.SelectedIndices[0]], false);
}
private void OK_Click(object sender, EventArgs e)
{
Run();
this.Close();
}
@ -159,5 +164,11 @@ namespace BizHawk.MultiClient
{
//TODO: a subtitle viewer/editor
}
private void MovieView_DoubleClick(object sender, EventArgs e)
{
Run();
this.Close();
}
}
}

11
BizHawk.MultiClient/RenderPanel.cs
View File

@ -292,18 +292,19 @@ namespace BizHawk.MultiClient
if (Global.Config.DisplayLagCounter)
{
MessageFont.DrawString(null, MakeLagCounter(), Global.Config.DispLagx + 1,
Global.Config.DispLagy + 1, new Color4(Color.Black));
if (Global.Emulator.IsLagFrame)
{
AlertFont.DrawString(null, MakeLagCounter(), Global.Config.DispLagx + 1,
Global.Config.DispLagy + 1, new Color4(Color.Black));
AlertFont.DrawString(null, MakeLagCounter(), Global.Config.DispLagx,
Global.Config.DispLagy, Color.FromArgb(Global.Config.AlertMessageColor));
Global.Config.DispLagy, Color.FromArgb(Global.Config.AlertMessageColor));
}
else
{
MessageFont.DrawString(null, MakeLagCounter(), Global.Config.DispLagx + 1,
Global.Config.DispLagy + 1, new Color4(Color.Black));
MessageFont.DrawString(null, MakeLagCounter(), Global.Config.DispLagx,
Global.Config.DispLagy, Color.FromArgb(Global.Config.MessagesColor));
Global.Config.DispLagy, Color.FromArgb(Global.Config.MessagesColor));
}
}