diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/GameInfoApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/GameInfoApi.cs index 58b3cf4949..1556fe78cb 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/GameInfoApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/GameInfoApi.cs @@ -25,7 +25,7 @@ namespace BizHawk.Client.EmuHawk { var options = new Dictionary(); if (GlobalWin.Game == null) return options; - foreach (var option in GlobalWin.Game.GetOptionsDict()) options[option.Key] = option.Value; + foreach (var option in GlobalWin.Game.GetOptions()) options[option.Key] = option.Value; return options; } } diff --git a/src/BizHawk.Emulation.Common/Database/GameInfo.cs b/src/BizHawk.Emulation.Common/Database/GameInfo.cs index 19a585a8cc..2ae67d739a 100644 --- a/src/BizHawk.Emulation.Common/Database/GameInfo.cs +++ b/src/BizHawk.Emulation.Common/Database/GameInfo.cs @@ -145,7 +145,7 @@ namespace BizHawk.Emulation.Common return defaultVal; } - public IReadOnlyDictionary GetOptionsDict() + public IReadOnlyDictionary GetOptions() { return new ReadOnlyDictionary(Options); } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs index 394f2eca35..6553a39267 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs @@ -194,7 +194,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 private void RebootCore() { // Regenerate mapper here to make sure its state is entirely clean - _mapper = CreateMapper(this, _game.GetOptionsDict()["m"], Rom.Length); + _mapper = CreateMapper(this, _game.GetOptions()["m"], Rom.Length); _lagCount = 0; Cpu = new MOS6502X(new CpuLink(this)); @@ -223,16 +223,16 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 RomDetails = $"{_game.Name}\r\nSHA1:{Rom.HashSHA1()}\r\nMD5:{Rom.HashMD5()}\r\nMapper Impl \"{_mapper.GetType()}\""; // Some games (ex. 3D tic tac toe), turn off the screen for extended periods, so we need to allow for this here. - if (_game.GetOptionsDict().ContainsKey("SP_FRAME")) + if (_game.GetOptions().ContainsKey("SP_FRAME")) { - if (_game.GetOptionsDict()["SP_FRAME"] == "true") + if (_game.GetOptions()["SP_FRAME"] == "true") { SP_FRAME = true; } } - if (_game.GetOptionsDict().ContainsKey("SP_RESET")) + if (_game.GetOptions().ContainsKey("SP_RESET")) { - if (_game.GetOptionsDict()["SP_RESET"] == "true") + if (_game.GetOptions()["SP_RESET"] == "true") { SP_RESET = true; } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs index d9250c8c59..68e535d125 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs @@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 Rom = rom; _game = game; - if (!game.GetOptionsDict().ContainsKey("m")) + if (!game.GetOptions().ContainsKey("m")) { game.AddOption("m", DetectMapper(rom)); } @@ -46,7 +46,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 game.AddOption("m", "F8_sega"); } - Console.WriteLine("Game uses mapper " + game.GetOptionsDict()["m"]); + Console.WriteLine("Game uses mapper " + game.GetOptions()["m"]); Console.WriteLine(Rom.HashSHA1()); RebootCore(); SetupMemoryDomains(); diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs index 0dfbeef5b8..4b7c19e78b 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs @@ -124,7 +124,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk if (gi != null) { - var dict = gi.GetOptionsDict(); + var dict = gi.GetOptions(); if (dict.ContainsKey("PAL")) { _isPAL = true; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs b/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs index de01986004..53ef6ed37d 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs @@ -47,7 +47,7 @@ namespace BizHawk.Emulation.Cores.Intellivision var gi = Database.CheckDatabase(hash_sha1); if (gi != null) { - var dict = gi.GetOptionsDict(); + var dict = gi.GetOptions(); if (!dict.ContainsKey("board")) { throw new Exception("INTV gamedb entries must have a board identifier!"); diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs index cbc0bfc8fb..d581592c16 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs @@ -161,7 +161,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES CartInfo cart = new CartInfo(); //try generating a bootgod cart descriptor from the game database - var dict = gi.GetOptionsDict(); + var dict = gi.GetOptions(); cart.GameInfo = gi; if (!dict.ContainsKey("board")) throw new Exception("NES gamedb entries must have a board identifier!");