From f697a52c560c3b16c6ef521aefc4169567f73b36 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 10 May 2014 20:00:30 +0000 Subject: [PATCH] Fix a few warnings --- BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs | 7 ++++--- BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs index 26a792ca20..efbf3cfb94 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs @@ -115,9 +115,10 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 { get { - if (false) - return _core.Settings.PALBottomLine - _core.Settings.PALTopLine; - else + // TODO PAL support + //if (false) + // return _core.Settings.PALBottomLine - _core.Settings.PALTopLine; + //else return _core.Settings.NTSCBottomLine - _core.Settings.NTSCTopLine; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs index 376498c472..b54f19fb17 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs @@ -25,7 +25,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte[] ram; NESWatch[] sysbus_watch = new NESWatch[65536]; public byte[] CIRAM; //AKA nametables - string game_name; //friendly name exposed to user and used as filename base + string game_name = string.Empty; //friendly name exposed to user and used as filename base CartInfo cart; //the current cart prototype. should be moved into the board, perhaps INESBoard board; //the board hardware that is currently driving things EDetectionOrigin origin = EDetectionOrigin.None;