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

Change handling of tex and shpk files to be simpler.

Browse source
This commit is contained in:
Ottermandias 2022-03-17 16:43:31 +01:00
parent e6752ade04
commit 0ba0c6d057
2 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Penumbra/Interop/Resolver/PathResolver.cs
View file

@ -29,8 +29,10 @@ public partial class PathResolver : IDisposable
// The modified resolver that handles game path resolving.
private (FullPath?, object?) CharacterResolver( Utf8GamePath gamePath )
{
// Check if the path was marked for a specific collection, if not use the default collection.
var nonDefault = PathCollections.TryGetValue( gamePath.Path, out var collection );
// Check if the path was marked for a specific collection,
// or if it is a file loaded by a material, and if we are currently in a material load.
// If not use the default collection.
var nonDefault = HandleMaterialSubFiles( gamePath, out var collection ) || PathCollections.TryGetValue( gamePath.Path, out collection );
if( !nonDefault )
{
collection = Penumbra.ModManager.Collections.DefaultCollection;