From f155375d3ed33bc61f5886c71bafaf83544b8152 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 22 Apr 2014 01:16:11 +0000 Subject: [PATCH] Set the Neshawk vs quicknes flag before loading a movie, using the setting in the movie --- BizHawk.Client.EmuHawk/MainForm.Movie.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs index af3bd4180d..274706083b 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs @@ -3,6 +3,8 @@ using System.IO; using System.Windows.Forms; using BizHawk.Client.Common; +using BizHawk.Emulation.Common; +using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; using BizHawk.Emulation.Cores.Nintendo.GBA; using BizHawk.Emulation.Cores.Sega.Genesis; using BizHawk.Emulation.Cores.Sega.Saturn; @@ -50,9 +52,19 @@ namespace BizHawk.Client.EmuHawk } else if (!record && Global.Emulator.SystemId == "NES") { - var s = new Emulation.Cores.Nintendo.NES.NES.NESSyncSettings(); - s.BoardProperties = new System.Collections.Generic.Dictionary(Global.MovieSession.Movie.Header.BoardProperties); - this._syncSettingsHack = s; + var quicknesName = ((CoreAttributes)Attribute.GetCustomAttribute(typeof(QuickNES), typeof(CoreAttributes))).CoreName; + if (Global.MovieSession.Movie.Header[HeaderKeys.CORE] == quicknesName) + { + Global.Config.NES_InQuickNES = true; + var qs = new QuickNES.QuickNESSettings(); + this._syncSettingsHack = qs; + } + else //Else assume Neshawk + { + var s = new Emulation.Cores.Nintendo.NES.NES.NESSyncSettings(); + s.BoardProperties = new System.Collections.Generic.Dictionary(Global.MovieSession.Movie.Header.BoardProperties); + this._syncSettingsHack = s; + } } else if (!record && Global.Emulator is Emulation.Cores.Consoles.Sega.gpgx.GPGX) {