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

Lua - fix emu.getdisplaytype() that has been broken for a long time, also fix it to properly use the IEmulatorService system instead of reflection shenanigans

This commit is contained in:
adelikat 2016-12-15 13:09:52 -06:00
parent 54eb678387
commit 2059558771
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs
View File

@ -34,6 +34,9 @@ namespace BizHawk.Client.Common
[OptionalService]
public IInputPollable InputPollableCore { get; set; }
[OptionalService]
public IRegionable RegionableCore { get; set; }
public Action FrameAdvanceCallback { get; set; }
public Action YieldCallback { get; set; }
@ -364,13 +367,9 @@ namespace BizHawk.Client.Common
)]
public string GetDisplayType()
{
if (Global.Game != null)
if (RegionableCore != null)
{
var displaytype = Emulator.GetType().GetProperty("DisplayType");
if (displaytype != null)
{
return displaytype.GetValue(Emulator, null).ToString();
}
return RegionableCore.Region.ToString();
}
return string.Empty;