ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Atari 7800 - when GameInfo options contains Pokey=true, use Emu7800 instead of A7800Hawk, regardless of core setting

This commit is contained in:
adelikat 2017-08-04 22:46:33 -05:00
parent 9819b92a42
commit b5bb68fec5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BizHawk.Client.Common/RomLoader.cs
View File

@ -939,10 +939,16 @@ namespace BizHawk.Client.Common
break; break;
case "A78": case "A78":
var gamedbpath = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "EMU7800.csv"); var gamedbpath = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "EMU7800.csv");
if (game["Pokey"] && game.OptionValue("Pokey") == "true") // A7800Hawk does not emulate Pokey so route it to Emu7800
nextEmulator = Global.Config.A78_UseEmu7800 {
? nextEmulator = new Atari7800(nextComm, game, rom.RomData, gamedbpath) nextEmulator = new Atari7800(nextComm, game, rom.RomData, gamedbpath);
: nextEmulator = new A7800Hawk(nextComm, game, rom.RomData, gamedbpath, GetCoreSettings<A7800Hawk>(), GetCoreSyncSettings<A7800Hawk>()); }
else
{
nextEmulator = Global.Config.A78_UseEmu7800
? nextEmulator = new Atari7800(nextComm, game, rom.RomData, gamedbpath)
: nextEmulator = new A7800Hawk(nextComm, game, rom.RomData, gamedbpath, GetCoreSettings<A7800Hawk>(), GetCoreSyncSettings<A7800Hawk>());
}
break; break;
case "C64": case "C64":