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

Use file type enum for Crc64 handling.

Browse source
This commit is contained in:
Ottermandias 2022-06-20 18:27:41 +02:00
parent c4f82435bf
commit 00c11b49f0
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Penumbra/Interop/Loader/ResourceLoader.Replacement.cs
View file

@ -68,7 +68,7 @@ public unsafe partial class ResourceLoader
} }
} }
private event Action< Utf8GamePath, FullPath?, object? >? PathResolved; private event Action< Utf8GamePath, ResourceType, FullPath?, object? >? PathResolved;
private ResourceHandle* GetResourceHandler( bool isSync, ResourceManager* resourceManager, ResourceCategory* categoryId, private ResourceHandle* GetResourceHandler( bool isSync, ResourceManager* resourceManager, ResourceCategory* categoryId,
ResourceType* resourceType, int* resourceHash, byte* path, GetResourceParameters* pGetResParams, bool isUnk ) ResourceType* resourceType, int* resourceHash, byte* path, GetResourceParameters* pGetResParams, bool isUnk )
@ -85,7 +85,7 @@ public unsafe partial class ResourceLoader
// If no replacements are being made, we still want to be able to trigger the event. // If no replacements are being made, we still want to be able to trigger the event.
var (resolvedPath, data) = ResolvePath( gamePath, *categoryId, *resourceType, *resourceHash ); var (resolvedPath, data) = ResolvePath( gamePath, *categoryId, *resourceType, *resourceHash );
PathResolved?.Invoke( gamePath, resolvedPath, data ); PathResolved?.Invoke( gamePath, *resourceType, resolvedPath, data );
if( resolvedPath == null ) if( resolvedPath == null )
{ {
var retUnmodified = CallOriginalHandler( isSync, resourceManager, categoryId, resourceType, resourceHash, path, pGetResParams, isUnk ); var retUnmodified = CallOriginalHandler( isSync, resourceManager, categoryId, resourceType, resourceHash, path, pGetResParams, isUnk );

7
Penumbra/Interop/Loader/ResourceLoader.TexMdl.cs
View file

@ -4,6 +4,7 @@ using Dalamud.Hooking;
using Dalamud.Utility.Signatures; using Dalamud.Utility.Signatures;
using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle; using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
using Penumbra.GameData.ByteString; using Penumbra.GameData.ByteString;
using Penumbra.GameData.Enums;
namespace Penumbra.Interop.Loader; namespace Penumbra.Interop.Loader;
@ -67,11 +68,11 @@ public unsafe partial class ResourceLoader
: LoadMdlFileExternHook.Original( resourceHandle, unk1, unk2, ptr ); : LoadMdlFileExternHook.Original( resourceHandle, unk1, unk2, ptr );
private void AddCrc( Utf8GamePath _, FullPath? path, object? _2 ) private void AddCrc( Utf8GamePath _, ResourceType type, FullPath? path, object? _2 )
{ {
if( path is { Extension: ".mdl" or ".tex" } p ) if( path.HasValue && type is ResourceType.Mdl or ResourceType.Tex )
{ {
_customFileCrc.Add( p.Crc64 ); _customFileCrc.Add( path.Value.Crc64 );
} }
} }