From 0d427dcabaf197298b50bd443fb12b2159b158fd Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Thu, 4 Apr 2024 14:02:12 +0200 Subject: [PATCH] Fix some obsoletes. --- Glamourer/Interop/ScalingService.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Glamourer/Interop/ScalingService.cs b/Glamourer/Interop/ScalingService.cs index c148bbd..1b55db2 100644 --- a/Glamourer/Interop/ScalingService.cs +++ b/Glamourer/Interop/ScalingService.cs @@ -100,11 +100,11 @@ public unsafe class ScalingService : IDisposable /// We do not change the Customize gender because the functions use the GetGender() vfunc, which uses the game objects gender value. private static (byte Race, byte Clan, byte Gender) GetScaleRelevantCustomize(Character* character) - => (character->DrawData.CustomizeData.Race, character->DrawData.CustomizeData.Clan, character->GameObject.Gender); + => (character->DrawData.CustomizeData.Race, character->DrawData.CustomizeData.Tribe, character->GameObject.Sex); private static (byte Gender, byte BodyType, byte Clan, byte Height) GetHeightRelevantCustomize(Character* character) => (character->DrawData.CustomizeData.Sex, character->DrawData.CustomizeData.BodyType, - character->DrawData.CustomizeData.Clan, character->DrawData.CustomizeData[(int)CustomizeIndex.Height]); + character->DrawData.CustomizeData.Tribe, character->DrawData.CustomizeData[(int)CustomizeIndex.Height]); [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] private static void SetScaleCustomize(Character* character, Model model) @@ -112,15 +112,15 @@ public unsafe class ScalingService : IDisposable if (!model.IsHuman) return; - SetScaleCustomize(character, model.AsHuman->Customize.Race, model.AsHuman->Customize.Clan, model.AsHuman->Customize.Sex); + SetScaleCustomize(character, model.AsHuman->Customize.Race, model.AsHuman->Customize.Tribe, model.AsHuman->Customize.Sex); } [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] private static void SetScaleCustomize(Character* character, byte race, byte clan, byte gender) { - character->DrawData.CustomizeData.Race = race; - character->DrawData.CustomizeData.Clan = clan; - character->GameObject.Gender = gender; + character->DrawData.CustomizeData.Race = race; + character->DrawData.CustomizeData.Tribe = clan; + character->GameObject.Sex = gender; } [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] @@ -129,7 +129,7 @@ public unsafe class ScalingService : IDisposable if (!model.IsHuman) return; - SetHeightCustomize(character, model.AsHuman->Customize.Sex, model.AsHuman->Customize.BodyType, model.AsHuman->Customize.Clan, + SetHeightCustomize(character, model.AsHuman->Customize.Sex, model.AsHuman->Customize.BodyType, model.AsHuman->Customize.Tribe, model.AsHuman->Customize[(int)CustomizeIndex.Height]); } @@ -138,7 +138,7 @@ public unsafe class ScalingService : IDisposable { character->DrawData.CustomizeData.Sex = gender; character->DrawData.CustomizeData.BodyType = bodyType; - character->DrawData.CustomizeData.Clan = clan; + character->DrawData.CustomizeData.Tribe = clan; character->DrawData.CustomizeData.Data[(int)CustomizeIndex.Height] = height; } }