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

Further fixes.

Browse source
This commit is contained in:
Ottermandias 2024-11-17 14:28:33 +01:00
parent e3a1ae6938
commit 5599f12753
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Penumbra/Interop/Hooks/Meta/CalculateHeight.cs
View file

@ -14,19 +14,19 @@ public sealed unsafe class CalculateHeight : FastHook<CalculateHeight.Delegate>
{ {
_collectionResolver = collectionResolver; _collectionResolver = collectionResolver;
_metaState = metaState; _metaState = metaState;
Task = hooks.CreateHook<Delegate>("Calculate Height", (nint)HeightContainer.MemberFunctionPointers.CalculateHeight, Detour, Task = hooks.CreateHook<Delegate>("Calculate Height", (nint)Character.MemberFunctionPointers.CalculateHeight, Detour,
!HookOverrides.Instance.Meta.CalculateHeight); !HookOverrides.Instance.Meta.CalculateHeight);
} }
public delegate ulong Delegate(HeightContainer* character); public delegate ulong Delegate(Character* character);
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
private ulong Detour(HeightContainer* container) private ulong Detour(Character* character)
{ {
var collection = _collectionResolver.IdentifyCollection((GameObject*)container->OwnerObject, true); var collection = _collectionResolver.IdentifyCollection((GameObject*)character, true);
_metaState.RspCollection.Push(collection); _metaState.RspCollection.Push(collection);
var ret = Task.Result.Original.Invoke(container); var ret = Task.Result.Original.Invoke(character);
Penumbra.Log.Excessive($"[Calculate Height] Invoked on {(nint)container:X} -> {ret}."); Penumbra.Log.Excessive($"[Calculate Height] Invoked on {(nint)character:X} -> {ret}.");
_metaState.RspCollection.Pop(); _metaState.RspCollection.Pop();
return ret; return ret;
} }

2
Penumbra/Interop/PathResolving/CollectionResolver.cs
View file

@ -240,7 +240,7 @@ public sealed unsafe class CollectionResolver(
} }
// Only handle human models. // Only handle human models.
if (!IsModelHuman((uint)actor.AsCharacter->ModelCharaId)) if (!IsModelHuman((uint)actor.AsCharacter->ModelContainer.ModelCharaId))
return null; return null;
if (actor.Customize->Data[0] == 0) if (actor.Customize->Data[0] == 0)

2
Penumbra/Interop/ResourceTree/ResourceTree.cs
View file

@ -68,7 +68,7 @@ public class ResourceTree
Unsafe.AsPointer(ref character->DrawData.EquipmentModelIds[0]), 10), Unsafe.AsPointer(ref character->DrawData.EquipmentModelIds[0]), 10),
_ => [], _ => [],
}; };
ModelId = character->ModelCharaId; ModelId = character->ModelContainer.ModelCharaId;
CustomizeData = character->DrawData.CustomizeData; CustomizeData = character->DrawData.CustomizeData;
RaceCode = human != null ? (GenderRace)human->RaceSexId : GenderRace.Unknown; RaceCode = human != null ? (GenderRace)human->RaceSexId : GenderRace.Unknown;