ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 20:54:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

do-while is actually more elegant for once

Browse source
This commit is contained in:
attickdoor 2020-03-13 23:44:09 -04:00
parent 39e196ddbb
commit 9186a1cf54
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dalamud/Game/SigScanner.cs
View file

@ -185,14 +185,15 @@ namespace Dalamud.Game {
public IntPtr GetStaticAddressFromSig(string signature, int offset) public IntPtr GetStaticAddressFromSig(string signature, int offset)
{ {
IntPtr instrAddr = ScanText(signature); IntPtr instrAddr = ScanText(signature);
instrAddr = IntPtr.Add(instrAddr, offset + 1); instrAddr = IntPtr.Add(instrAddr, offset);
long bAddr = (long)Module.BaseAddress; long bAddr = (long)Module.BaseAddress;
var num = (long)Marshal.ReadInt32(instrAddr) + (long)instrAddr + 4 - bAddr; long num;
while(! (num >= DataSectionOffset && num <= DataSectionOffset + DataSectionSize)) do
{ {
instrAddr= IntPtr.Add(instrAddr, 1); instrAddr = IntPtr.Add(instrAddr, 1);
num = Marshal.ReadInt32(instrAddr) + (long)instrAddr + 4 - bAddr; num = Marshal.ReadInt32(instrAddr) + (long)instrAddr + 4 - bAddr;
} }
while (!(num >= DataSectionOffset && num <= DataSectionOffset + DataSectionSize));
return IntPtr.Add(instrAddr, Marshal.ReadInt32(instrAddr) + 4); return IntPtr.Add(instrAddr, Marshal.ReadInt32(instrAddr) + 4);
} }