Hex Editor - more long conversion, highlighting will now work until the scrollbar value itself overflows

This commit is contained in:
adelikat 2015-01-18 18:13:38 +00:00
parent 6507fa5d92
commit 89b3c31872
1 changed files with 7 additions and 7 deletions

View File

@ -46,7 +46,7 @@ namespace BizHawk.Client.EmuHawk
private long _addressHighlighted = -1; private long _addressHighlighted = -1;
private long _addressOver = -1; private long _addressOver = -1;
private int _maxRow; private long _maxRow;
private MemoryDomain _domain = new MemoryDomain( private MemoryDomain _domain = new MemoryDomain(
"NULL", 1024, MemoryDomain.Endian.Little, addr => 0, delegate(long a, byte v) { v = 0; }); "NULL", 1024, MemoryDomain.Endian.Little, addr => 0, delegate(long a, byte v) { v = 0; });
@ -546,10 +546,10 @@ namespace BizHawk.Client.EmuHawk
return rowStr.ToString(); return rowStr.ToString();
} }
private byte MakeByte(int address) private byte MakeByte(long address)
{ {
return Global.CheatList.IsActive(_domain, address) return Global.CheatList.IsActive(_domain, (int)address) // int to long todo
? Global.CheatList.GetByteValue(_domain, address).Value ? Global.CheatList.GetByteValue(_domain, (int)address).Value
: _domain.PeekByte(address); : _domain.PeekByte(address);
} }
@ -584,7 +584,7 @@ namespace BizHawk.Client.EmuHawk
} }
BigEndian = _domain.EndianType == MemoryDomain.Endian.Big; BigEndian = _domain.EndianType == MemoryDomain.Endian.Big;
_maxRow = (int)(_domain.Size / 2); _maxRow = _domain.Size / 2;
SetUpScrollBar(); SetUpScrollBar();
if (0 >= HexScrollBar.Minimum && 0 <= HexScrollBar.Maximum) if (0 >= HexScrollBar.Minimum && 0 <= HexScrollBar.Maximum)
{ {
@ -864,9 +864,9 @@ namespace BizHawk.Client.EmuHawk
AddressLabel.Text = GenerateAddressString(); AddressLabel.Text = GenerateAddressString();
} }
private int GetPointedAddress(int x, int y) private long GetPointedAddress(int x, int y)
{ {
int address; long address;
// Scroll value determines the first row // Scroll value determines the first row
var i = HexScrollBar.Value; var i = HexScrollBar.Value;