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

When playing a movie, don't override the user's Neshawk/Quicknes setting unless it is specified in the movie header

This commit is contained in:
adelikat 2014-05-29 12:25:42 +00:00
parent a19e67deea
commit c211533b20
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -43,14 +43,15 @@ namespace BizHawk.Client.EmuHawk
try try
{ {
var quicknesName = ((CoreAttributes)Attribute.GetCustomAttribute(typeof(QuickNES), typeof(CoreAttributes))).CoreName; var quicknesName = ((CoreAttributes)Attribute.GetCustomAttribute(typeof(QuickNES), typeof(CoreAttributes))).CoreName;
var neshawkName = ((CoreAttributes)Attribute.GetCustomAttribute(typeof(NES), typeof(CoreAttributes))).CoreName;
if (!record && Global.Emulator.SystemId == "NES") // For NES we need special logic since the movie will drive which core to load if (!record && Global.Emulator.SystemId == "NES") // For NES we need special logic since the movie will drive which core to load
{ {
// If either is specified use that, else use whatever is currently set
if (Global.MovieSession.Movie.Header[HeaderKeys.CORE] == quicknesName) if (Global.MovieSession.Movie.Header[HeaderKeys.CORE] == quicknesName)
{ {
Global.Config.NES_InQuickNES = true; Global.Config.NES_InQuickNES = true;
} }
else else if (Global.MovieSession.Movie.Header[HeaderKeys.CORE] == neshawkName)
{ {
Global.Config.NES_InQuickNES = false; Global.Config.NES_InQuickNES = false;
} }