diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs index 31bd45b403..9c604a6d92 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs @@ -162,8 +162,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo x += 3; break; } - int y = 0; - return ROM[(bank_32k * 0x8000) + addr]; + return ROM[(bank_32k << 15) + addr]; } public override byte ReadPPU(int addr) diff --git a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs index 55f2c9e1e1..fc27df0fdb 100644 --- a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs +++ b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs @@ -409,7 +409,7 @@ namespace BizHawk.MultiClient else g.DrawString(GUITextList[x].Message, MessageFont, GUITextList[x].ForeColor, posx, posy); } - catch (Exception e) + catch (Exception) { return; } @@ -514,11 +514,11 @@ namespace BizHawk.MultiClient if (Global.MovieSession.Movie.Mode == MOVIEMODE.PLAY) { - int r = (int)g.ClipBounds.Width; - Point[] p = { new Point(r - 20, 2), - new Point(r - 4, 12), - new Point(r - 20, 22) }; //TODO + //int r = (int)g.ClipBounds.Width; + //Point[] p = { new Point(r - 20, 2), + // new Point(r - 4, 12), + // new Point(r - 20, 22) }; //g.FillPolygon(new SolidBrush(Color.Red), p); //g.DrawPolygon(new Pen(new SolidBrush(Color.Pink)), p); diff --git a/BizHawk.MultiClient/tools/CheatList.cs b/BizHawk.MultiClient/tools/CheatList.cs index 6c27afb7de..f56bed8142 100644 --- a/BizHawk.MultiClient/tools/CheatList.cs +++ b/BizHawk.MultiClient/tools/CheatList.cs @@ -137,44 +137,47 @@ namespace BizHawk.MultiClient } } - public string GetCheatsPath() + public string CheatsPath { - string path; - switch (Global.Emulator.SystemId) + get { - case "NES": - path = PathManager.MakeAbsolutePath(Global.Config.PathNESCheats, "NES"); - break; - case "SMS": - path = PathManager.MakeAbsolutePath(Global.Config.PathSMSCheats, "SMS"); - break; - case "SG": - path = PathManager.MakeAbsolutePath(Global.Config.PathSGCheats, "SG"); - break; - case "GG": - path = PathManager.MakeAbsolutePath(Global.Config.PathGGCheats, "GG"); - break; - case "GEN": - path = PathManager.MakeAbsolutePath(Global.Config.PathGenesisCheats, "GEN"); - break; - case "SFX": - case "PCE": - path = PathManager.MakeAbsolutePath(Global.Config.PathPCECheats, "PCE"); - break; - case "GB": - path = PathManager.MakeAbsolutePath(Global.Config.PathGBCheats, "GB"); - break; - case "TI83": - path = PathManager.MakeAbsolutePath(Global.Config.PathTI83Cheats, "TI83"); - break; - default: - path = PathManager.GetBasePathAbsolute(); - break; + string path; + switch (Global.Emulator.SystemId) + { + case "NES": + path = PathManager.MakeAbsolutePath(Global.Config.PathNESCheats, "NES"); + break; + case "SMS": + path = PathManager.MakeAbsolutePath(Global.Config.PathSMSCheats, "SMS"); + break; + case "SG": + path = PathManager.MakeAbsolutePath(Global.Config.PathSGCheats, "SG"); + break; + case "GG": + path = PathManager.MakeAbsolutePath(Global.Config.PathGGCheats, "GG"); + break; + case "GEN": + path = PathManager.MakeAbsolutePath(Global.Config.PathGenesisCheats, "GEN"); + break; + case "SFX": + case "PCE": + path = PathManager.MakeAbsolutePath(Global.Config.PathPCECheats, "PCE"); + break; + case "GB": + path = PathManager.MakeAbsolutePath(Global.Config.PathGBCheats, "GB"); + break; + case "TI83": + path = PathManager.MakeAbsolutePath(Global.Config.PathTI83Cheats, "TI83"); + break; + default: + path = PathManager.GetBasePathAbsolute(); + break; + } + var f = new FileInfo(path); + if (f.Directory.Exists == false) + f.Directory.Create(); + return path; } - var f = new FileInfo(path); - if (f.Directory.Exists == false) - f.Directory.Create(); - return path; } public bool SaveCheatFile(string path) @@ -232,7 +235,7 @@ namespace BizHawk.MultiClient public string MakeDefaultFilename() { - return Path.Combine(Global.CheatList.GetCheatsPath(), PathManager.FilesystemSafeName(Global.Game) + ".cht"); + return Path.Combine(Global.CheatList.CheatsPath, PathManager.FilesystemSafeName(Global.Game) + ".cht"); } private int GetNumDigits(Int32 i) diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs index 4b7803f015..ca005873f6 100644 --- a/BizHawk.MultiClient/tools/Cheats.cs +++ b/BizHawk.MultiClient/tools/Cheats.cs @@ -362,7 +362,7 @@ namespace BizHawk.MultiClient sfd.FileName = Path.GetFileNameWithoutExtension(Global.CheatList.currentCheatFile); else if (!(Global.Emulator is NullEmulator)) sfd.FileName = PathManager.FilesystemSafeName(Global.Game); - sfd.InitialDirectory = Global.CheatList.GetCheatsPath(); + sfd.InitialDirectory = Global.CheatList.CheatsPath; sfd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*"; sfd.RestoreDirectory = true; Global.Sound.StopSound(); @@ -471,7 +471,7 @@ namespace BizHawk.MultiClient var ofd = new OpenFileDialog(); if (Global.CheatList.currentCheatFile.Length > 0) ofd.FileName = Path.GetFileNameWithoutExtension(Global.CheatList.currentCheatFile); - ofd.InitialDirectory = Global.CheatList.GetCheatsPath(); + ofd.InitialDirectory = Global.CheatList.CheatsPath; ofd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*"; ofd.RestoreDirectory = true;