From 911554bbfac884f9fa45c447b2d21041e0d0dca8 Mon Sep 17 00:00:00 2001 From: OV2 Date: Tue, 28 Sep 2010 21:25:34 +0200 Subject: [PATCH] Two fixes by Jonas Quinn Super Buster Bros. graphics after reset Fix BlockInvalidVRAMAccess config file option (windows port, unix port and gtk legacy config) --- cpu.cpp | 1 - snes9x.cpp | 12 ++++++------ win32/wconfig.cpp | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cpu.cpp b/cpu.cpp index 3e249cc5..f2efb4ce 100644 --- a/cpu.cpp +++ b/cpu.cpp @@ -307,7 +307,6 @@ void S9xSoftReset (void) { S9xResetSaveTimer(FALSE); - memset(Memory.VRAM, 0x00, 0x10000); ZeroMemory(Memory.FillRAM, 0x8000); if (Settings.BS) diff --git a/snes9x.cpp b/snes9x.cpp index 79fe2ad7..ec955bea 100644 --- a/snes9x.cpp +++ b/snes9x.cpp @@ -464,12 +464,12 @@ void S9xLoadConfigFiles (char **argv, int argc) // Hack - Settings.DisableGameSpecificHacks = !conf.GetBool("Hack::EnableGameSpecificHacks", true); - Settings.BlockInvalidVRAMAccess = !conf.GetBool("Hack::AllowInvalidVRAMAccess", false); - Settings.ShutdownMaster = conf.GetBool("Hack::SpeedHacks", false); - Settings.DisableIRQ = conf.GetBool("Hack::DisableIRQ", false); - Settings.DisableHDMA = conf.GetBool("Hack::DisableHDMA", false); - Settings.HDMATimingHack = conf.GetInt ("Hack::HDMATiming", 100); + Settings.DisableGameSpecificHacks = !conf.GetBool("Hack::EnableGameSpecificHacks", true); + Settings.BlockInvalidVRAMAccessMaster = !conf.GetBool("Hack::AllowInvalidVRAMAccess", false); + Settings.ShutdownMaster = conf.GetBool("Hack::SpeedHacks", false); + Settings.DisableIRQ = conf.GetBool("Hack::DisableIRQ", false); + Settings.DisableHDMA = conf.GetBool("Hack::DisableHDMA", false); + Settings.HDMATimingHack = conf.GetInt ("Hack::HDMATiming", 100); // Netplay diff --git a/win32/wconfig.cpp b/win32/wconfig.cpp index 8018fa18..c36774be 100644 --- a/win32/wconfig.cpp +++ b/win32/wconfig.cpp @@ -303,7 +303,6 @@ void WinSetDefaultValues () Settings.HDMATimingHack = 100; Settings.Shutdown = false; Settings.ShutdownMaster = false; - Settings.BlockInvalidVRAMAccess = true; Settings.DisableIRQ = false; Settings.Paused = false; Timings.H_Max = SNES_CYCLES_PER_SCANLINE; @@ -992,7 +991,7 @@ void WinRegisterConfigItems() AddUIntC("TurboFrameSkip", Settings.TurboSkipFrames, 15, "how many frames to skip when in fast-forward mode"); AddUInt("AutoSaveDelay", Settings.AutoSaveDelay, 30); AddBool2C("SpeedHacks", Settings.ShutdownMaster, false, "on to skip emulating the CPU when it is not being used ... recommended OFF"); - AddBool("BlockInvalidVRAMAccess", Settings.BlockInvalidVRAMAccess, true); + AddBool("BlockInvalidVRAMAccess", Settings.BlockInvalidVRAMAccessMaster, true); AddBool2C("SnapshotScreenshots", Settings.SnapshotScreenshots, true, "on to save the screenshot in each snapshot, for loading-when-paused display"); AddBoolC("MovieTruncateAtEnd", Settings.MovieTruncate, true, "true to truncate any leftover data in the movie file after the current frame when recording stops"); AddBoolC("MovieNotifyIgnored", Settings.MovieNotifyIgnored, false, "true to display \"(ignored)\" in the frame counter when recording when the last frame of input was not used by the SNES (such as lag or loading frames)");