Skip to content

Commit

Permalink
update csObject->DrawObject to Actor->Model!!!
Browse files Browse the repository at this point in the history
  • Loading branch information
chirpxiv committed Jan 18, 2023
1 parent b86792a commit e67d07b
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions Ktisis/Interop/Hooks/PoseHooks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,17 @@ public static unsafe bool IsGamePlaybackRunning(GameObject? gPoseTarget) {

public static unsafe hkaDefaultAnimationControl* GetAnimationControl(GameObject? go) {
if (go == null) return null;
var csObject = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)go.Address;
if (csObject->DrawObject == null ||
csObject->DrawObject->Skeleton == null ||
csObject->DrawObject->Skeleton->PartialSkeletons == null ||
csObject->DrawObject->Skeleton->PartialSkeletons->GetHavokAnimatedSkeleton(0) == null ||
csObject->DrawObject->Skeleton->PartialSkeletons->GetHavokAnimatedSkeleton(0)->AnimationControls.Length == 0 ||
csObject->DrawObject->Skeleton->PartialSkeletons->GetHavokAnimatedSkeleton(0)->AnimationControls[0].Value == null)

var actor = (Actor*)go.Address;
if (actor->Model == null ||
actor->Model->Skeleton == null ||
actor->Model->Skeleton->PartialSkeletons == null ||
actor->Model->Skeleton->PartialSkeletons->GetHavokAnimatedSkeleton(0) == null ||
actor->Model->Skeleton->PartialSkeletons->GetHavokAnimatedSkeleton(0)->AnimationControls.Length == 0 ||
actor->Model->Skeleton->PartialSkeletons->GetHavokAnimatedSkeleton(0)->AnimationControls[0].Value == null)
return null;
return csObject->DrawObject->Skeleton->PartialSkeletons->GetHavokAnimatedSkeleton(0)->AnimationControls[0];

return actor->Model->Skeleton->PartialSkeletons->GetHavokAnimatedSkeleton(0)->AnimationControls[0];
}

internal static void Dispose() {
Expand Down

0 comments on commit e67d07b

Please sign in to comment.