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

Add a nag when attempting to record a quicknes movie (but allow the user to continue), fixes #1353

This commit is contained in:
adelikat 2018-11-18 10:05:06 -06:00
parent e368f42254
commit 06bb89791f
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -501,6 +501,31 @@ namespace BizHawk.Client.EmuHawk
// Do nothing and allow the user to continue to record the movie // Do nothing and allow the user to continue to record the movie
} }
} }
else if (Emulator is QuickNES) // This is unsustainable :( But mixing the logic together is even worse, this needs to be rethought
{
var box = new MsgBox(
"While the QuickNes core is faster, it is not nearly as accurate as NesHawk. \nIt is recommended that you switch to the NesHawk core for movie recording\nSwitch to NesHawk?",
"Accuracy Warning",
MessageBoxIcon.Warning);
box.SetButtons(
new[] { "Switch", "Continue" },
new[] { DialogResult.Yes, DialogResult.Cancel });
box.MaximumSize = new Size(475, 350);
box.SetMessageToAutoSize();
var result = box.ShowDialog();
if (result == DialogResult.Yes)
{
Global.Config.NES_InQuickNES = false;
RebootCore();
}
else if (result == DialogResult.Cancel)
{
// Do nothing and allow the user to continue to record the movie
}
}
new RecordMovie(Emulator).ShowDialog(); new RecordMovie(Emulator).ShowDialog();
} }

26
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -15,6 +15,7 @@ using BizHawk.Client.Common.MovieConversionExtensions;
using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Client.EmuHawk.WinFormExtensions;
using BizHawk.Client.EmuHawk.ToolExtensions; using BizHawk.Client.EmuHawk.ToolExtensions;
using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
@ -341,6 +342,31 @@ namespace BizHawk.Client.EmuHawk
//return false; //return false;
} }
} }
else if (Emulator is QuickNES) // Copy pasta of unsustainable logic, even better
{
var box = new CustomControls.MsgBox(
"While the QuickNes core is faster, it is not nearly as accurate as NesHawk. \nIt is recommended that you switch to the NesHawk core for movie recording\nSwitch to NesHawk?",
"Accuracy Warning",
MessageBoxIcon.Warning);
box.SetButtons(
new[] { "Switch", "Continue" },
new[] { DialogResult.Yes, DialogResult.Cancel });
box.MaximumSize = new Size(475, 350);
box.SetMessageToAutoSize();
var result = box.ShowDialog();
if (result == DialogResult.Yes)
{
Global.Config.NES_InQuickNES = false;
Mainform.RebootCore();
}
else if (result == DialogResult.Cancel)
{
//return false;
}
}
// Start Scenario 1: A regular movie is active // Start Scenario 1: A regular movie is active
if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie)) if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie))