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

Ram Search - fix change count logic and previous value as previous frame

This commit is contained in:
adelikat 2014-01-02 17:56:57 +00:00
parent 1626e8b43e
commit b67e97f9aa
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -866,6 +866,7 @@ namespace BizHawk.Client.Common
public int Address { get; private set; } public int Address { get; private set; }
private byte _previous; private byte _previous;
private byte _prevFrame;
private int _changecount; private int _changecount;
public MiniByteWatchDetailed(MemoryDomain domain, int addr) public MiniByteWatchDetailed(MemoryDomain domain, int addr)
@ -876,7 +877,7 @@ namespace BizHawk.Client.Common
public void SetPreviousToCurrent(MemoryDomain domain, bool bigendian) public void SetPreviousToCurrent(MemoryDomain domain, bool bigendian)
{ {
_previous = domain.PeekByte(Address); _previous = _prevFrame = domain.PeekByte(Address);
} }
public int Previous public int Previous
@ -892,7 +893,8 @@ namespace BizHawk.Client.Common
public void Update(Watch.PreviousType type, MemoryDomain domain, bool bigendian) public void Update(Watch.PreviousType type, MemoryDomain domain, bool bigendian)
{ {
var value = domain.PeekByte(Address); var value = domain.PeekByte(Address);
if (value != Previous)
if (value != _prevFrame)
{ {
_changecount++; _changecount++;
} }
@ -903,9 +905,11 @@ namespace BizHawk.Client.Common
case Watch.PreviousType.LastSearch: case Watch.PreviousType.LastSearch:
break; break;
case Watch.PreviousType.LastFrame: case Watch.PreviousType.LastFrame:
_previous = value; _previous = _prevFrame;
break; break;
} }
_prevFrame = value;
} }
public void ClearChangeCount() public void ClearChangeCount()
@ -919,6 +923,7 @@ namespace BizHawk.Client.Common
public int Address { get; private set; } public int Address { get; private set; }
private ushort _previous; private ushort _previous;
private ushort _prevFrame;
private int _changecount; private int _changecount;
public MiniWordWatchDetailed(MemoryDomain domain, int addr, bool bigEndian) public MiniWordWatchDetailed(MemoryDomain domain, int addr, bool bigEndian)
@ -929,7 +934,7 @@ namespace BizHawk.Client.Common
public void SetPreviousToCurrent(MemoryDomain domain, bool bigendian) public void SetPreviousToCurrent(MemoryDomain domain, bool bigendian)
{ {
_previous = domain.PeekWord(Address, bigendian); _previous = _prevFrame = domain.PeekWord(Address, bigendian);
} }
public int Previous public int Previous
@ -956,9 +961,11 @@ namespace BizHawk.Client.Common
case Watch.PreviousType.LastSearch: case Watch.PreviousType.LastSearch:
break; break;
case Watch.PreviousType.LastFrame: case Watch.PreviousType.LastFrame:
_previous = value; _previous = _prevFrame;
break; break;
} }
_prevFrame = value;
} }
public void ClearChangeCount() public void ClearChangeCount()
@ -972,6 +979,7 @@ namespace BizHawk.Client.Common
public int Address { get; private set; } public int Address { get; private set; }
private uint _previous; private uint _previous;
private uint _prevFrame;
private int _changecount; private int _changecount;
public MiniDWordWatchDetailed(MemoryDomain domain, int addr, bool bigEndian) public MiniDWordWatchDetailed(MemoryDomain domain, int addr, bool bigEndian)
@ -982,7 +990,7 @@ namespace BizHawk.Client.Common
public void SetPreviousToCurrent(MemoryDomain domain, bool bigendian) public void SetPreviousToCurrent(MemoryDomain domain, bool bigendian)
{ {
_previous = domain.PeekDWord(Address, bigendian); _previous = _prevFrame = domain.PeekDWord(Address, bigendian);
} }
public int Previous public int Previous
@ -1009,9 +1017,11 @@ namespace BizHawk.Client.Common
case Watch.PreviousType.LastSearch: case Watch.PreviousType.LastSearch:
break; break;
case Watch.PreviousType.LastFrame: case Watch.PreviousType.LastFrame:
_previous = value; _previous = _prevFrame;
break; break;
} }
_prevFrame = value;
} }
public void ClearChangeCount() public void ClearChangeCount()