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

Fix some warnings.

Browse source
This commit is contained in:
Ottermandias 2023-05-25 00:56:15 +02:00
parent b51ced8cfb
commit 78aff2b9dc
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Penumbra.GameData/Actors/ActorManager.Data.cs
View file

@ -250,7 +250,7 @@ public sealed partial class ActorManager : IDisposable
private unsafe bool SearchPlayerCustomize(Character* character, int idx, out ActorIdentifier id) private unsafe bool SearchPlayerCustomize(Character* character, int idx, out ActorIdentifier id)
{ {
var other = (Character*)_objects.GetObjectAddress(idx); var other = (Character*)_objects.GetObjectAddress(idx);
if (other == null || !CustomizeData.ScreenActorEquals((CustomizeData*)character->CustomizeData, (CustomizeData*)other->CustomizeData)) if (other == null || !CustomizeData.ScreenActorEquals((CustomizeData*)character->DrawData.CustomizeData.Data, (CustomizeData*)other->DrawData.CustomizeData.Data))
{ {
id = ActorIdentifier.Invalid; id = ActorIdentifier.Invalid;
return false; return false;
@ -271,8 +271,8 @@ public sealed partial class ActorManager : IDisposable
{ {
static bool Compare(Character* a, Character* b) static bool Compare(Character* a, Character* b)
{ {
var data1 = (CustomizeData*)a->CustomizeData; var data1 = (CustomizeData*)a->DrawData.CustomizeData.Data;
var data2 = (CustomizeData*)b->CustomizeData; var data2 = (CustomizeData*)b->DrawData.CustomizeData.Data;
var equals = CustomizeData.ScreenActorEquals(data1, data2); var equals = CustomizeData.ScreenActorEquals(data1, data2);
return equals; return equals;
} }

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

@ -216,13 +216,13 @@ public unsafe class CollectionResolver
if (!IsModelHuman((uint)character->ModelCharaId)) if (!IsModelHuman((uint)character->ModelCharaId))
return null; return null;
if (character->CustomizeData[0] == 0) if (character->DrawData.CustomizeData[0] == 0)
{ {
notYetReady = true; notYetReady = true;
return null; return null;
} }
var bodyType = character->CustomizeData[2]; var bodyType = character->DrawData.CustomizeData[2];
var collection = bodyType switch var collection = bodyType switch
{ {
3 => _collectionManager.Active.ByType(CollectionType.NonPlayerElderly), 3 => _collectionManager.Active.ByType(CollectionType.NonPlayerElderly),
@ -232,8 +232,8 @@ public unsafe class CollectionResolver
if (collection != null) if (collection != null)
return collection; return collection;
var race = (SubRace)character->CustomizeData[4]; var race = (SubRace)character->DrawData.CustomizeData[4];
var gender = (Gender)(character->CustomizeData[1] + 1); var gender = (Gender)(character->DrawData.CustomizeData[1] + 1);
var isNpc = actor->ObjectKind != (byte)ObjectKind.Player; var isNpc = actor->ObjectKind != (byte)ObjectKind.Player;
var type = CollectionTypeExtensions.FromParts(race, gender, isNpc); var type = CollectionTypeExtensions.FromParts(race, gender, isNpc);

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

@ -35,7 +35,7 @@ public class ResourceTree
{ {
var character = (Character*)SourceAddress; var character = (Character*)SourceAddress;
var model = (CharacterBase*)character->GameObject.GetDrawObject(); var model = (CharacterBase*)character->GameObject.GetDrawObject();
var equipment = new ReadOnlySpan<CharacterArmor>(character->EquipSlotData, 10); var equipment = new ReadOnlySpan<CharacterArmor>(&character->DrawData.Head, 10);
// var customize = new ReadOnlySpan<byte>( character->CustomizeData, 26 ); // var customize = new ReadOnlySpan<byte>( character->CustomizeData, 26 );
ModelId = character->ModelCharaId; ModelId = character->ModelCharaId;
CustomizeData = character->DrawData.CustomizeData; CustomizeData = character->DrawData.CustomizeData;