This commit is contained in:
Ottermandias 2022-10-08 19:06:09 +02:00
parent 8f93df533a
commit e226b20953
4 changed files with 8 additions and 8 deletions

@ -1 +1 @@
Subproject commit 0064bb82be9729676e7bf3202ff1407283e6f088
Subproject commit 162985704fa4e020443bf18f88dd17dd702c2312

View file

@ -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()

View file

@ -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

View file

@ -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;