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

Removed reference to Global.Emulator from RamSearchEngine.

This commit is contained in:
scepheo 2014-12-16 01:50:22 +00:00
parent 77be509e44
commit 14e2b280ac
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.Client.Common/tools/RamSearchEngine.cs
View File

@ -26,9 +26,9 @@ namespace BizHawk.Client.Common
private bool _keepHistory = true; private bool _keepHistory = true;
private bool _isSorted = true; // Tracks whether or not the list is sorted by address, if it is, binary search can be used for finding watches private bool _isSorted = true; // Tracks whether or not the list is sorted by address, if it is, binary search can be used for finding watches
public RamSearchEngine(Settings settings) public RamSearchEngine(Settings settings, IMemoryDomains memoryDomains)
{ {
_settings = new Settings(Global.Emulator.AsMemoryDomains()); _settings = new Settings(memoryDomains);
_settings.Mode = settings.Mode; _settings.Mode = settings.Mode;
_settings.Domain = settings.Domain; _settings.Domain = settings.Domain;
_settings.Size = settings.Size; _settings.Size = settings.Size;
@ -38,8 +38,8 @@ namespace BizHawk.Client.Common
_settings.PreviousType = settings.PreviousType; _settings.PreviousType = settings.PreviousType;
} }
public RamSearchEngine(Settings settings, Compare compareTo, long? compareValue, int? differentBy) public RamSearchEngine(Settings settings, IMemoryDomains memoryDomains, Compare compareTo, long? compareValue, int? differentBy)
: this(settings) : this(settings, memoryDomains)
{ {
_compareTo = compareTo; _compareTo = compareTo;
_differentBy = differentBy; _differentBy = differentBy;
@ -1182,6 +1182,7 @@ namespace BizHawk.Client.Common
public Settings(IMemoryDomains core) public Settings(IMemoryDomains core)
{ {
BigEndian = core.MemoryDomains.MainMemory.EndianType == MemoryDomain.Endian.Big; BigEndian = core.MemoryDomains.MainMemory.EndianType == MemoryDomain.Endian.Big;
// TODO: Fetch this default from the IMemoryDomains object when that's implemented.
Size = (Watch.WatchSize)Global.SystemInfo.ByteSize; Size = (Watch.WatchSize)Global.SystemInfo.ByteSize;
Type = Watch.DisplayType.Unsigned; Type = Watch.DisplayType.Unsigned;
Mode = core.MemoryDomains.MainMemory.Size > (1024 * 1024) ? Mode = core.MemoryDomains.MainMemory.Size > (1024 * 1024) ?

4
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -117,7 +117,7 @@ namespace BizHawk.Client.EmuHawk
private void RamSearch_Load(object sender, EventArgs e) private void RamSearch_Load(object sender, EventArgs e)
{ {
_settings = new RamSearchEngine.Settings(Core); _settings = new RamSearchEngine.Settings(Core);
_searches = new RamSearchEngine(_settings); _searches = new RamSearchEngine(_settings, Core);
ErrorIconButton.Visible = false; ErrorIconButton.Visible = false;
_dropdownDontfire = true; _dropdownDontfire = true;
@ -313,7 +313,7 @@ namespace BizHawk.Client.EmuHawk
var compareVal = _searches.CompareValue; var compareVal = _searches.CompareValue;
var differentBy = _searches.DifferentBy; var differentBy = _searches.DifferentBy;
_searches = new RamSearchEngine(_settings, compareTo, compareVal, differentBy); _searches = new RamSearchEngine(_settings, Core, compareTo, compareVal, differentBy);
_searches.Start(); _searches.Start();
if (Global.Config.RamSearchAlwaysExcludeRamWatch) if (Global.Config.RamSearchAlwaysExcludeRamWatch)
{ {