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

[api11] Use Conditions address from CS (#2064)

Browse source
This commit is contained in:
Haselnussbomber 2024-11-05 22:37:45 +01:00 • committed by GitHub
parent 30d56e4d11
commit d4735980c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Dalamud/Game/ClientState/ClientStateAddressResolver.cs
View file

@ -50,11 +50,6 @@ internal sealed class ClientStateAddressResolver : BaseAddressResolver
/// </summary> /// </summary>
public IntPtr KeyboardStateIndexArray { get; private set; } public IntPtr KeyboardStateIndexArray { get; private set; }
/// <summary>
/// Gets the address of the condition flag array.
/// </summary>
public IntPtr ConditionFlags { get; private set; }
// Functions // Functions
/// <summary> /// <summary>
@ -93,8 +88,6 @@ internal sealed class ClientStateAddressResolver : BaseAddressResolver
this.KeyboardState = sig.ScanText("48 8D 0C 85 ?? ?? ?? ?? 8B 04 31 85 C2 0F 85") + 0x4; this.KeyboardState = sig.ScanText("48 8D 0C 85 ?? ?? ?? ?? 8B 04 31 85 C2 0F 85") + 0x4;
this.KeyboardStateIndexArray = sig.ScanText("0F B6 94 33 ?? ?? ?? ?? 84 D2") + 0x4; this.KeyboardStateIndexArray = sig.ScanText("0F B6 94 33 ?? ?? ?? ?? 84 D2") + 0x4;
this.ConditionFlags = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? 8B D3 E8 ?? ?? ?? ?? 32 C0 48 83 C4 20");
this.GamepadPoll = sig.ScanText("40 55 53 57 41 54 41 57 48 8D AC 24 ?? ?? ?? ?? 48 81 EC ?? ?? ?? ?? 44 0F 29 B4 24"); this.GamepadPoll = sig.ScanText("40 55 53 57 41 54 41 57 48 8D AC 24 ?? ?? ?? ?? 48 81 EC ?? ?? ?? ?? 44 0F 29 B4 24");
} }
} }

5
Dalamud/Game/ClientState/Conditions/Condition.cs
View file

@ -28,10 +28,9 @@ internal sealed class Condition : IInternalDisposableService, ICondition
private bool isDisposed; private bool isDisposed;
[ServiceManager.ServiceConstructor] [ServiceManager.ServiceConstructor]
private Condition(ClientState clientState) private unsafe Condition()
{ {
var resolver = clientState.AddressResolver; this.Address = (nint)FFXIVClientStructs.FFXIV.Client.Game.Conditions.Instance();
this.Address = resolver.ConditionFlags;
// Initialization // Initialization
for (var i = 0; i < MaxConditionEntries; i++) for (var i = 0; i < MaxConditionEntries; i++)