ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: IconReplacer sigs for 5.15 WIP

Browse source
This commit is contained in:
goat 2019-12-10 23:12:39 +09:00
parent 130fbe8639
commit 7124ea379c
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Dalamud/Game/Internal/Gui/IconReplacer.cs
View file

@ -35,11 +35,13 @@ namespace Dalamud.Game.Internal.Gui {
this.Address = new IconReplacerAddressResolver(); this.Address = new IconReplacerAddressResolver();
this.Address.Setup(scanner); this.Address.Setup(scanner);
this.byteBase = scanner.Module.BaseAddress; this.byteBase = scanner.Module.BaseAddress;
this.comboTimer = byteBase + 0x1BB0B50; //this.comboTimer = byteBase + 0x1BB0B50;
this.lastComboMove = byteBase + 0x1BB0B54; this.comboTimer = scanner.ScanText("E8 ?? ?? ?? ?? 80 7E 21 00") + 0x178;
this.playerLevel = byteBase + 0x1C28FA8 + 0x78; this.lastComboMove = this.comboTimer + 0x4;
//this.playerLevel = byteBase + 0x1C28FA8 + 0x78;
this.playerLevel = scanner.ScanText("E8 ?? ?? ?? ?? 88 45 EF") + 0x4D;
CustomIDs = new HashSet<uint>(); CustomIDs = new HashSet<uint>();
VanillaIDs = new HashSet<uint>(); VanillaIDs = new HashSet<uint>();
@ -49,6 +51,9 @@ namespace Dalamud.Game.Internal.Gui {
Log.Verbose("===== H O T B A R S ====="); Log.Verbose("===== H O T B A R S =====");
Log.Verbose("IsIconReplaceable address {IsIconReplaceable}", Address.IsIconReplaceable); Log.Verbose("IsIconReplaceable address {IsIconReplaceable}", Address.IsIconReplaceable);
Log.Verbose("GetIcon address {GetIcon}", Address.GetIcon); Log.Verbose("GetIcon address {GetIcon}", Address.GetIcon);
Log.Verbose("ComboTimer address {ComboTimer}", this.comboTimer);
Log.Verbose("LastComboMove address {LastComboMove}", this.lastComboMove);
Log.Verbose("PlayerLevel address {PlayerLevel}", this.playerLevel);
this.iconHook = new Hook<OnGetIconDelegate>(this.Address.GetIcon, new OnGetIconDelegate(GetIconDetour), this); this.iconHook = new Hook<OnGetIconDelegate>(this.Address.GetIcon, new OnGetIconDelegate(GetIconDetour), this);
this.checkerHook = new Hook<OnCheckIsIconReplaceableDelegate>(this.Address.IsIconReplaceable, new OnCheckIsIconReplaceableDelegate(CheckIsIconReplaceableDetour), this); this.checkerHook = new Hook<OnCheckIsIconReplaceableDelegate>(this.Address.IsIconReplaceable, new OnCheckIsIconReplaceableDelegate(CheckIsIconReplaceableDetour), this);

7
Dalamud/Game/Internal/Gui/IconReplacerAddressResolver.cs
View file

@ -10,8 +10,11 @@ namespace Dalamud.Game.Internal.Gui {
public IntPtr IsIconReplaceable { get; private set; } public IntPtr IsIconReplaceable { get; private set; }
protected override void Setup64Bit(SigScanner sig) { protected override void Setup64Bit(SigScanner sig) {
this.GetIcon = sig.ScanText("48 89 5c 24 08 48 89 6c 24 10 48 89 74 24 18 57 48 83 ec 30 8b da be dd 1c 00 00 bd d3 0d 00 00"); //this.GetIcon = sig.ScanText("48 89 5c 24 08 48 89 6c 24 10 48 89 74 24 18 57 48 83 ec 30 8b da be dd 1c 00 00 bd d3 0d 00 00");
this.IsIconReplaceable = sig.ScanText("81 f9 2e 01 00 00 7f 39 81 f9 2d 01 00 00 0f 8d 11 02 00 00 83 c1 eb"); this.GetIcon = sig.ScanText("E8 ?? ?? ?? ?? F6 DB 8B C8");
//this.IsIconReplaceable = sig.ScanText("81 f9 2e 01 00 00 7f 39 81 f9 2d 01 00 00 0f 8d 11 02 00 00 83 c1 eb");
this.IsIconReplaceable = sig.ScanText("81 F9 ?? ?? ?? ?? 7F 39 81 F9 ?? ?? ?? ??");
} }
} }
} }