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: missing args in HandleActionHoverHook (#2440)

Browse source 
- remove verbose logs
This commit is contained in:
KazWolfe 2025-10-28 16:15:56 -07:00 • committed by GitHub
parent 31340dda84
commit de07a5f1b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Dalamud/Game/Gui/GameGui.cs
View file

@ -280,8 +280,6 @@ internal sealed unsafe class GameGui : IInternalDisposableService, IGameGui
this.HoveredItem = itemId; this.HoveredItem = itemId;
this.HoveredItemChanged?.InvokeSafely(this, itemId); this.HoveredItemChanged?.InvokeSafely(this, itemId);
Log.Verbose($"HoveredItem changed: {itemId}");
} }
private AtkValue* HandleItemOutDetour(AgentItemDetail* thisPtr, AtkValue* returnValue, AtkValue* values, uint valueCount, ulong eventKind) private AtkValue* HandleItemOutDetour(AgentItemDetail* thisPtr, AtkValue* returnValue, AtkValue* values, uint valueCount, ulong eventKind)
@ -292,22 +290,18 @@ internal sealed unsafe class GameGui : IInternalDisposableService, IGameGui
{ {
this.HoveredItem = 0; this.HoveredItem = 0;
this.HoveredItemChanged?.InvokeSafely(this, 0ul); this.HoveredItemChanged?.InvokeSafely(this, 0ul);
Log.Verbose("HoveredItem changed: 0");
} }
return ret; return ret;
} }
private void HandleActionHoverDetour(AgentActionDetail* hoverState, FFXIVClientStructs.FFXIV.Client.UI.Agent.ActionKind actionKind, uint actionId, int a4, bool a5) private void HandleActionHoverDetour(AgentActionDetail* hoverState, FFXIVClientStructs.FFXIV.Client.UI.Agent.ActionKind actionKind, uint actionId, int a4, bool a5, int a6, int a7)
{ {
this.handleActionHoverHook.Original(hoverState, actionKind, actionId, a4, a5); this.handleActionHoverHook.Original(hoverState, actionKind, actionId, a4, a5, a6, a7);
this.HoveredAction.ActionKind = (HoverActionKind)actionKind; this.HoveredAction.ActionKind = (HoverActionKind)actionKind;
this.HoveredAction.BaseActionID = actionId; this.HoveredAction.BaseActionID = actionId;
this.HoveredAction.ActionID = hoverState->ActionId; this.HoveredAction.ActionID = hoverState->ActionId;
this.HoveredActionChanged?.InvokeSafely(this, this.HoveredAction); this.HoveredActionChanged?.InvokeSafely(this, this.HoveredAction);
Log.Verbose($"HoverActionId: {actionKind}/{actionId} this:{(nint)hoverState:X}");
} }
private AtkValue* HandleActionOutDetour(AgentActionDetail* agentActionDetail, AtkValue* a2, AtkValue* a3, uint a4, ulong a5) private AtkValue* HandleActionOutDetour(AgentActionDetail* agentActionDetail, AtkValue* a2, AtkValue* a3, uint a4, ulong a5)
@ -324,8 +318,6 @@ internal sealed unsafe class GameGui : IInternalDisposableService, IGameGui
this.HoveredAction.BaseActionID = 0; this.HoveredAction.BaseActionID = 0;
this.HoveredAction.ActionID = 0; this.HoveredAction.ActionID = 0;
this.HoveredActionChanged?.InvokeSafely(this, this.HoveredAction); this.HoveredActionChanged?.InvokeSafely(this, this.HoveredAction);
Log.Verbose("HoverActionId: 0");
} }
} }

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit bf9759183bc9ef50e5d1ccfafcefdde8585612c7 Subproject commit c1a76eb2afab08457f77dca91f4cef2b050dc949