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

O2Hawk: fix #2684

This commit is contained in:
alyosha-tas 2021-05-17 18:29:00 -04:00
parent 4f24c6ac70
commit 94a851ef9e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Client.Common/movie/PlatformFrameRates.cs
View File

@ -71,7 +71,9 @@ namespace BizHawk.Client.Common
["ZXSpectrum_PAL"] = 50.080128205, ["ZXSpectrum_PAL"] = 50.080128205,
["AmstradCPC_PAL"] = 50.08012820512821, ["AmstradCPC_PAL"] = 50.08012820512821,
["UZE"] = 60.016319939602, ["UZE"] = 60.016319939602,
["VEC"] = 50 ["VEC"] = 50,
["O2"] = 60,
["O2_PAL"] = 50
}; };
public static double GetFrameRate(string systemId, bool pal) public static double GetFrameRate(string systemId, bool pal)

2
src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs
View File

@ -121,7 +121,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
HardReset(); HardReset();
} }
public DisplayType Region => DisplayType.NTSC; public DisplayType Region => is_pal ? DisplayType.PAL : DisplayType.NTSC;
private readonly O2HawkControllerDeck _controllerDeck; private readonly O2HawkControllerDeck _controllerDeck;