From a1844f5d5ccb0448cc05845229875805eac9bd95 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Sat, 11 Apr 2020 10:37:12 -0400 Subject: [PATCH] O2Hawk: correctly remove videbuffer from state --- .../Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs | 6 +++--- .../Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs index d5773be982..fa2b4d618f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs +++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs @@ -56,9 +56,6 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk // update the controller state on VBlank GetControllerState(controller); - // send the image on VBlank - SendVideoBuffer(); - bool frame_chk = true; //Console.WriteLine("----------FRAME----------"); @@ -110,6 +107,9 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk in_vblank_old = in_vblank; } } + + // send the image on VBlank + SendVideoBuffer(); } public void do_single_step() diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs index c6392f48d0..682f0abd36 100644 --- a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs @@ -39,8 +39,6 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk ser.Sync(nameof(kb_state_row), ref kb_state_row); ser.Sync(nameof(kb_state_col), ref kb_state_col); - ser.Sync(nameof(_vidbuffer), ref _vidbuffer, false); - // probably a better way to do this if (cart_RAM != null) {