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

Lua - memory library - actually default to system bus, previous commit was unsufficient

This commit is contained in:
adelikat 2016-11-12 11:55:20 -06:00
parent e73a66b07e
commit 7bff28bdee
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs
View File

@ -15,26 +15,13 @@ namespace BizHawk.Client.Common
public MemoryLuaLibrary(Lua lua)
: base(lua)
{
if (MemoryDomainCore != null)
{
if (MemoryDomainCore.HasSystemBus)
{
_currentMemoryDomain = MemoryDomainCore.SystemBus;
}
else
{
_currentMemoryDomain = MemoryDomainCore.MainMemory;
}
}
}
public MemoryLuaLibrary(Lua lua, Action<string> logOutputCallback)
: base(lua, logOutputCallback)
{
if (MemoryDomainCore != null)
{
_currentMemoryDomain = MemoryDomainCore.MainMemory;
}
}
public override string Name { get { return "memory"; } }
@ -47,7 +34,14 @@ namespace BizHawk.Client.Common
{
if (_currentMemoryDomain == null)
{
_currentMemoryDomain = MemoryDomainCore.MainMemory;
if (MemoryDomainCore.HasSystemBus)
{
_currentMemoryDomain = MemoryDomainCore.SystemBus;
}
else
{
_currentMemoryDomain = MemoryDomainCore.MainMemory;
}
}
return _currentMemoryDomain;