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

Fix a bug with RSP changes on non-base collections.

Browse source
This commit is contained in:
Ottermandias 2022-11-25 12:25:52 +01:00
parent 7033b65d33
commit 7a09d561e9
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Penumbra/Interop/Resolver/PathResolver.DrawObjectState.cs
View file

@ -144,10 +144,8 @@ public unsafe partial class PathResolver
_lastCreatedCollection = IdentifyCollection( LastGameObject, false ); _lastCreatedCollection = IdentifyCollection( LastGameObject, false );
// Change the transparent or 1.0 Decal if necessary. // Change the transparent or 1.0 Decal if necessary.
var decal = new CharacterUtility.DecalReverter( _lastCreatedCollection.ModCollection, UsesDecal( a, c ) ); var decal = new CharacterUtility.DecalReverter( _lastCreatedCollection.ModCollection, UsesDecal( a, c ) );
// Change the rsp parameters if necessary. // Change the rsp parameters.
meta = new DisposableContainer( _lastCreatedCollection.ModCollection != Penumbra.CollectionManager.Default meta = new DisposableContainer( _lastCreatedCollection.ModCollection.TemporarilySetCmpFile(), decal );
? _lastCreatedCollection.ModCollection.TemporarilySetCmpFile()
: null, decal );
try try
{ {
var modelPtr = &a; var modelPtr = &a;
@ -160,16 +158,19 @@ public unsafe partial class PathResolver
} }
var ret = _characterBaseCreateHook.Original( a, b, c, d ); var ret = _characterBaseCreateHook.Original( a, b, c, d );
using( meta ) try
{ {
if( LastGameObject != null && ret != IntPtr.Zero ) if( LastGameObject != null && ret != IntPtr.Zero )
{ {
_drawObjectToObject[ ret ] = ( _lastCreatedCollection!, LastGameObject->ObjectIndex ); _drawObjectToObject[ ret ] = ( _lastCreatedCollection!, LastGameObject->ObjectIndex );
CreatedCharacterBase?.Invoke( ( IntPtr )LastGameObject, _lastCreatedCollection!.ModCollection.Name, ret ); CreatedCharacterBase?.Invoke( ( IntPtr )LastGameObject, _lastCreatedCollection!.ModCollection.Name, ret );
} }
return ret;
} }
finally
{
meta.Dispose();
}
return ret;
} }
// Check the customize array for the FaceCustomization byte and the last bit of that. // Check the customize array for the FaceCustomization byte and the last bit of that.

4
Penumbra/Interop/Resolver/PathResolver.Meta.cs
View file

@ -188,7 +188,9 @@ public unsafe partial class PathResolver
var resolveData = GetResolveData( human ); var resolveData = GetResolveData( human );
using var cmp = resolveData.ModCollection.TemporarilySetCmpFile(); using var cmp = resolveData.ModCollection.TemporarilySetCmpFile();
using var decals = new CharacterUtility.DecalReverter( resolveData.ModCollection, DrawObjectState.UsesDecal( 0, data ) ); using var decals = new CharacterUtility.DecalReverter( resolveData.ModCollection, DrawObjectState.UsesDecal( 0, data ) );
return _changeCustomize.Original( human, data, skipEquipment ); var ret = _changeCustomize.Original( human, data, skipEquipment );
_inChangeCustomize = false;
return ret;
} }
public static DisposableContainer ResolveEqdpData( ModCollection collection, GenderRace race, bool equipment, bool accessory ) public static DisposableContainer ResolveEqdpData( ModCollection collection, GenderRace race, bool equipment, bool accessory )