ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-28 11:29:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add another hook for animations in character collections.

Browse source
This commit is contained in:
Ottermandias 2022-06-18 14:23:28 +02:00
parent 58e46accae
commit df1a75b58a
3 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Penumbra/Interop/Resolver/PathResolver.Data.cs
View file

@ -93,6 +93,7 @@ public unsafe partial class PathResolver
LoadTimelineResourcesHook?.Enable();
CharacterBaseLoadAnimationHook?.Enable();
LoadSomeAvfxHook?.Enable();
LoadSomePapHook?.Enable();
}
private void DisableDataHooks()
@ -105,6 +106,7 @@ public unsafe partial class PathResolver
LoadTimelineResourcesHook?.Disable();
CharacterBaseLoadAnimationHook?.Disable();
LoadSomeAvfxHook?.Disable();
LoadSomePapHook?.Disable();
}
private void DisposeDataHooks()
@ -116,6 +118,7 @@ public unsafe partial class PathResolver
LoadTimelineResourcesHook?.Dispose();
CharacterBaseLoadAnimationHook?.Dispose();
LoadSomeAvfxHook?.Dispose();
LoadSomePapHook?.Dispose();
}
// This map links DrawObjects directly to Actors (by ObjectTable index) and their collections.
@ -272,8 +275,12 @@ public unsafe partial class PathResolver
}
// Housing Retainers
if( Penumbra.Config.UseDefaultCollectionForRetainers && gameObject->ObjectKind == (byte) ObjectKind.EventNpc && gameObject->DataID == 1011832 )
if( Penumbra.Config.UseDefaultCollectionForRetainers
&& gameObject->ObjectKind == ( byte )ObjectKind.EventNpc
&& gameObject->DataID == 1011832 )
{
return Penumbra.CollectionManager.Default;
}
string? actorName = null;
if( Penumbra.Config.PreferNamedCollectionsOverOwners )