From e226b20953c77af0746e52fba5998d27f56d239e Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Sat, 8 Oct 2022 19:06:09 +0200 Subject: [PATCH] Better. --- Penumbra.Api | 2 +- Penumbra/Api/PenumbraApi.cs | 8 ++++---- Penumbra/Api/PenumbraIpcProviders.cs | 4 ++-- Penumbra/Interop/ObjectReloader.cs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Penumbra.Api b/Penumbra.Api index 0064bb82..16298570 160000 --- a/Penumbra.Api +++ b/Penumbra.Api @@ -1 +1 @@ -Subproject commit 0064bb82be9729676e7bf3202ff1407283e6f088 +Subproject commit 162985704fa4e020443bf18f88dd17dd702c2312 diff --git a/Penumbra/Api/PenumbraApi.cs b/Penumbra/Api/PenumbraApi.cs index eeb8bfb3..9b35332a 100644 --- a/Penumbra/Api/PenumbraApi.cs +++ b/Penumbra/Api/PenumbraApi.cs @@ -31,13 +31,13 @@ public class PenumbraApi : IDisposable, IPenumbraApi public event Action< string >? PreSettingsPanelDraw; public event Action< string >? PostSettingsPanelDraw; - public event GameObjectRedrawn? GameObjectRedrawn + public event GameObjectRedrawnDelegate? GameObjectRedrawn { add => _penumbra!.ObjectReloader.GameObjectRedrawn += value; remove => _penumbra!.ObjectReloader.GameObjectRedrawn -= value; } - public event ModSettingChanged? ModSettingChanged; + public event ModSettingChangedDelegate? ModSettingChanged; public event CreatingCharacterBaseDelegate? CreatingCharacterBase { @@ -260,10 +260,10 @@ public class PenumbraApi : IDisposable, IPenumbraApi return ( obj, collection.ModCollection.Name ); } - public int GetCutsceneParentIndex( int actor ) + public int GetCutsceneParentIndex( int actorIdx ) { CheckInitialized(); - return _penumbra!.PathResolver.CutsceneActor( actor ); + return _penumbra!.PathResolver.CutsceneActor( actorIdx ); } public IList< (string, string) > GetModList() diff --git a/Penumbra/Api/PenumbraIpcProviders.cs b/Penumbra/Api/PenumbraIpcProviders.cs index 26a982ce..5156b081 100644 --- a/Penumbra/Api/PenumbraIpcProviders.cs +++ b/Penumbra/Api/PenumbraIpcProviders.cs @@ -163,7 +163,6 @@ public class PenumbraIpcProviders : IDisposable SetModPath = Ipc.SetModPath.Provider( pi, Api.SetModPath ); // ModSettings - GetAvailableModSettings = Ipc.GetAvailableModSettings.Provider( pi, Api.GetAvailableModSettings ); GetCurrentModSettings = Ipc.GetCurrentModSettings.Provider( pi, Api.GetCurrentModSettings ); TryInheritMod = Ipc.TryInheritMod.Provider( pi, Api.TryInheritMod ); @@ -190,6 +189,8 @@ public class PenumbraIpcProviders : IDisposable public void Dispose() { + Tester.Dispose(); + // Plugin State Initialized.Dispose(); ApiVersion.Dispose(); @@ -268,7 +269,6 @@ public class PenumbraIpcProviders : IDisposable Disposed.Invoke(); Disposed.Dispose(); - Tester.Dispose(); } // Wrappers diff --git a/Penumbra/Interop/ObjectReloader.cs b/Penumbra/Interop/ObjectReloader.cs index 4fecf454..7a3e7915 100644 --- a/Penumbra/Interop/ObjectReloader.cs +++ b/Penumbra/Interop/ObjectReloader.cs @@ -109,7 +109,7 @@ public sealed unsafe partial class ObjectReloader : IDisposable private readonly List< int > _afterGPoseQueue = new(GPoseSlots); private int _target = -1; - public event GameObjectRedrawn? GameObjectRedrawn; + public event GameObjectRedrawnDelegate? GameObjectRedrawn; public ObjectReloader() => Dalamud.Framework.Update += OnUpdateEvent;