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

Fix behaviour for non-main-map resources in debug.

Browse source
This commit is contained in:
Ottermandias 2022-03-18 11:07:36 +01:00
parent 6949011acf
commit d07355c0f8
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Penumbra/Interop/Loader/ResourceLoader.Debug.cs
View file

@ -21,7 +21,7 @@ public unsafe partial class ResourceLoader
{
public ResourceHandle* OriginalResource;
public ResourceHandle* ManipulatedResource;
public Utf8GamePath OriginalPath;
public Utf8GamePath OriginalPath;
public FullPath ManipulatedPath;
public ResourceCategory Category;
public object? ResolverInfo;
@ -52,7 +52,7 @@ public unsafe partial class ResourceLoader
}
var crc = ( uint )originalPath.Path.Crc32;
var originalResource = ( *ResourceManager )->FindResourceHandle( &handle->Category, &handle->FileType, &crc );
var originalResource = FindResource( handle->Category, handle->FileType, crc );
_debugList[ manipulatedPath.Value ] = new DebugData()
{
OriginalResource = originalResource,
@ -113,9 +113,12 @@ public unsafe partial class ResourceLoader
// Find a resource in the resource manager by its category, extension and crc-hash
public static ResourceHandle* FindResource( ResourceCategory cat, uint ext, uint crc32 )
{
var manager = *ResourceManager;
var manager = *ResourceManager;
var catIdx = ( uint )cat >> 0x18;
cat = ( ResourceCategory )( ushort )cat;
var category = ( ResourceGraph.CategoryContainer* )manager->ResourceGraph->ContainerArray + ( int )cat;
var extMap = FindInMap( category->MainMap, ext );
var extMap = FindInMap( ( StdMap< uint, Pointer< StdMap< uint, Pointer< ResourceHandle > > > >* )category->CategoryMaps[ catIdx ],
ext );
if( extMap == null )
{
return null;