From 85a7c60daedf7bf85dc0b4c914f1ff3fd9689c1f Mon Sep 17 00:00:00 2001 From: MidoriKami Date: Sun, 30 Nov 2025 22:20:02 -0800 Subject: [PATCH] Fix name inconsistency --- .../Game/Addon/Lifecycle/AddonVirtualTable.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Dalamud/Game/Addon/Lifecycle/AddonVirtualTable.cs b/Dalamud/Game/Addon/Lifecycle/AddonVirtualTable.cs index 6a27cc8f9..8fbf77534 100644 --- a/Dalamud/Game/Addon/Lifecycle/AddonVirtualTable.cs +++ b/Dalamud/Game/Addon/Lifecycle/AddonVirtualTable.cs @@ -102,10 +102,10 @@ internal unsafe class AddonVirtualTable : IDisposable this.closeFunction = this.OnAddonClose; this.showFunction = this.OnAddonShow; this.hideFunction = this.OnAddonHide; - this.onMoveFunction = this.OnMove; - this.onMouseOverFunction = this.OnMouseOver; - this.onMouseOutFunction = this.OnMouseOut; - this.focusFunction = this.OnFocus; + this.onMoveFunction = this.OnAddonMove; + this.onMouseOverFunction = this.OnAddonMouseOver; + this.onMouseOutFunction = this.OnAddonMouseOut; + this.focusFunction = this.OnAddonFocus; // Overwrite specific virtual table entries this.modifiedVirtualTable->Dtor = (delegate* unmanaged)Marshal.GetFunctionPointerForDelegate(this.destructorFunction); @@ -409,7 +409,7 @@ internal unsafe class AddonVirtualTable : IDisposable this.lifecycleService.InvokeListenersSafely(AddonEvent.PostHide, this.hideArgs); } - private void OnMove(AtkUnitBase* thisPtr) + private void OnAddonMove(AtkUnitBase* thisPtr) { this.LogEvent(EnableLogging); @@ -422,13 +422,13 @@ internal unsafe class AddonVirtualTable : IDisposable } catch (Exception e) { - Log.Error(e, "Caught exception when calling original OnMove. This may be a bug in the game or another plugin hooking this method."); + Log.Error(e, "Caught exception when calling original OnAddonMove. This may be a bug in the game or another plugin hooking this method."); } this.lifecycleService.InvokeListenersSafely(AddonEvent.PostMove, this.onMoveArgs); } - private void OnMouseOver(AtkUnitBase* thisPtr) + private void OnAddonMouseOver(AtkUnitBase* thisPtr) { this.LogEvent(EnableLogging); @@ -441,13 +441,13 @@ internal unsafe class AddonVirtualTable : IDisposable } catch (Exception e) { - Log.Error(e, "Caught exception when calling original OnMouseOver. This may be a bug in the game or another plugin hooking this method."); + Log.Error(e, "Caught exception when calling original OnAddonMouseOver. This may be a bug in the game or another plugin hooking this method."); } this.lifecycleService.InvokeListenersSafely(AddonEvent.PostMouseOver, this.onMouseOverArgs); } - private void OnMouseOut(AtkUnitBase* thisPtr) + private void OnAddonMouseOut(AtkUnitBase* thisPtr) { this.LogEvent(EnableLogging); @@ -460,13 +460,13 @@ internal unsafe class AddonVirtualTable : IDisposable } catch (Exception e) { - Log.Error(e, "Caught exception when calling original OnMouseOut. This may be a bug in the game or another plugin hooking this method."); + Log.Error(e, "Caught exception when calling original OnAddonMouseOut. This may be a bug in the game or another plugin hooking this method."); } this.lifecycleService.InvokeListenersSafely(AddonEvent.PostMouseOut, this.onMouseOutArgs); } - private void OnFocus(AtkUnitBase* thisPtr) + private void OnAddonFocus(AtkUnitBase* thisPtr) { this.LogEvent(EnableLogging); @@ -479,7 +479,7 @@ internal unsafe class AddonVirtualTable : IDisposable } catch (Exception e) { - Log.Error(e, "Caught exception when calling original OnFocus. This may be a bug in the game or another plugin hooking this method."); + Log.Error(e, "Caught exception when calling original OnAddonFocus. This may be a bug in the game or another plugin hooking this method."); } this.lifecycleService.InvokeListenersSafely(AddonEvent.PostFocus, this.focusArgs);