From ebc7958a68d19a25e059f72dac55ce2aa5c4224e Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Fri, 25 Aug 2017 09:42:39 -0400 Subject: [PATCH] Update Movies to remove EMU7800 --- BizHawk.Client.Common/movie/MovieSession.cs | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs index 313e313cd9..a8b82e741a 100644 --- a/BizHawk.Client.Common/movie/MovieSession.cs +++ b/BizHawk.Client.Common/movie/MovieSession.cs @@ -8,7 +8,6 @@ using BizHawk.Emulation.Cores.Nintendo.SNES9X; using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Nintendo.GBA; using BizHawk.Emulation.Cores.Atari.A7800Hawk; -using BizHawk.Emulation.Cores.Atari.Atari7800; namespace BizHawk.Client.Common { @@ -465,7 +464,6 @@ namespace BizHawk.Client.Common public bool? PreviousNES_InQuickNES { get; set; } public bool? PreviousSNES_InSnes9x { get; set; } public bool? PreviousGBA_UsemGBA { get; set; } - public bool? PreviousA78_UseEmu7800 { get; set; } public void QueueNewMovie(IMovie movie, bool record, IEmulator emulator) { @@ -533,22 +531,6 @@ namespace BizHawk.Client.Common Global.Config.GBA_UsemGBA = false; } } - else if (!record && emulator.SystemId == "A78") // meh, copy pasta one more time, last time, I promise - { - var atari7800HawkName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(A7800Hawk), typeof(CoreAttribute))).CoreName; - var emu7800HawkName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(Atari7800), typeof(CoreAttribute))).CoreName; - - if (movie.Core == atari7800HawkName) - { - PreviousA78_UseEmu7800 = Global.Config.A78_UseEmu7800; - Global.Config.A78_UseEmu7800 = true; - } - else if (movie.Core == emu7800HawkName) - { - PreviousA78_UseEmu7800 = Global.Config.A78_UseEmu7800; - Global.Config.A78_UseEmu7800 = false; - } - } if (record) // This is a hack really, we need to set the movie to its propert state so that it will be considered active later {