Fix some obsoletes.

This commit is contained in:
Ottermandias 2024-04-04 14:02:12 +02:00
parent 8375abd6cb
commit 0d427dcaba

View file

@ -100,11 +100,11 @@ public unsafe class ScalingService : IDisposable
/// <summary> We do not change the Customize gender because the functions use the GetGender() vfunc, which uses the game objects gender value. </summary> /// <summary> We do not change the Customize gender because the functions use the GetGender() vfunc, which uses the game objects gender value. </summary>
private static (byte Race, byte Clan, byte Gender) GetScaleRelevantCustomize(Character* character) 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) private static (byte Gender, byte BodyType, byte Clan, byte Height) GetHeightRelevantCustomize(Character* character)
=> (character->DrawData.CustomizeData.Sex, character->DrawData.CustomizeData.BodyType, => (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)] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
private static void SetScaleCustomize(Character* character, Model model) private static void SetScaleCustomize(Character* character, Model model)
@ -112,15 +112,15 @@ public unsafe class ScalingService : IDisposable
if (!model.IsHuman) if (!model.IsHuman)
return; 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)] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
private static void SetScaleCustomize(Character* character, byte race, byte clan, byte gender) private static void SetScaleCustomize(Character* character, byte race, byte clan, byte gender)
{ {
character->DrawData.CustomizeData.Race = race; character->DrawData.CustomizeData.Race = race;
character->DrawData.CustomizeData.Clan = clan; character->DrawData.CustomizeData.Tribe = clan;
character->GameObject.Gender = gender; character->GameObject.Sex = gender;
} }
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
@ -129,7 +129,7 @@ public unsafe class ScalingService : IDisposable
if (!model.IsHuman) if (!model.IsHuman)
return; 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]); model.AsHuman->Customize[(int)CustomizeIndex.Height]);
} }
@ -138,7 +138,7 @@ public unsafe class ScalingService : IDisposable
{ {
character->DrawData.CustomizeData.Sex = gender; character->DrawData.CustomizeData.Sex = gender;
character->DrawData.CustomizeData.BodyType = bodyType; character->DrawData.CustomizeData.BodyType = bodyType;
character->DrawData.CustomizeData.Clan = clan; character->DrawData.CustomizeData.Tribe = clan;
character->DrawData.CustomizeData.Data[(int)CustomizeIndex.Height] = height; character->DrawData.CustomizeData.Data[(int)CustomizeIndex.Height] = height;
} }
} }