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

Fix dumbness (all of it, please)

Browse source
This commit is contained in:
Ottermandias 2022-04-29 17:07:35 +02:00
parent 15602f5be5
commit c9c4447f3d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ public unsafe partial class PathResolver
var name = lastUnderscore == -1 ? split.ToString() : split.Substring( 0, lastUnderscore ).ToString(); var name = lastUnderscore == -1 ? split.ToString() : split.Substring( 0, lastUnderscore ).ToString();
if( Penumbra.CollectionManager.ByName( name, out var collection ) ) if( Penumbra.CollectionManager.ByName( name, out var collection ) )
{ {
PluginLog.Verbose( "Using MtrlLoadHandler with collection {$Split:l} for path {$Path:l}.", split, path ); PluginLog.Verbose( "Using MtrlLoadHandler with collection {$Split:l} for path {$Path:l}.", name, path );
SetCollection( path, collection ); SetCollection( path, collection );
} }
else else
@ -102,7 +102,7 @@ public unsafe partial class PathResolver
{ {
if( nonDefault && type == ResourceType.Mtrl ) if( nonDefault && type == ResourceType.Mtrl )
{ {
var fullPath = new FullPath( $"|{collection.RecomputeCounter}_{collection.Name}|{path}" ); var fullPath = new FullPath( $"|{collection.Name}_{collection.RecomputeCounter}|{path}" );
data = ( fullPath, collection ); data = ( fullPath, collection );
} }
else else

2
Penumbra/Meta/Manager/MetaManager.Imc.cs
View file

@ -125,7 +125,7 @@ public partial class MetaManager
} }
private FullPath CreateImcPath( Utf8GamePath path ) private FullPath CreateImcPath( Utf8GamePath path )
=> new($"|{_collection.RecomputeCounter}_{_collection.Name}|{path}"); => new($"|{_collection.Name}_{_collection.RecomputeCounter}|{path}");
private static unsafe bool ImcLoadHandler( Utf8String split, Utf8String path, ResourceManager* resourceManager, private static unsafe bool ImcLoadHandler( Utf8String split, Utf8String path, ResourceManager* resourceManager,
SeFileDescriptor* fileDescriptor, int priority, bool isSync, out byte ret ) SeFileDescriptor* fileDescriptor, int priority, bool isSync, out byte ret )