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

Force IsSync in certain situations.

Browse source
This commit is contained in:
Ottermandias 2022-04-29 21:22:54 +02:00
parent c9c4447f3d
commit c390b57b0f
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -163,13 +163,18 @@ public unsafe partial class ResourceLoader
var split = gamePath.Path.Split( ( byte )'|', 3, false ); var split = gamePath.Path.Split( ( byte )'|', 3, false );
fileDescriptor->ResourceHandle->FileNameData = split[ 2 ].Path; fileDescriptor->ResourceHandle->FileNameData = split[ 2 ].Path;
fileDescriptor->ResourceHandle->FileNameLength = split[ 2 ].Length; fileDescriptor->ResourceHandle->FileNameLength = split[ 2 ].Length;
// Force isSync = true for these calls. I don't really understand why,
// or where the difference even comes from.
// Was called with True on my client and with false on other peoples clients,
// which caused problems.
var funcFound = ResourceLoadCustomization.GetInvocationList() var funcFound = ResourceLoadCustomization.GetInvocationList()
.Any( f => ( ( ResourceLoadCustomizationDelegate )f ) .Any( f => ( ( ResourceLoadCustomizationDelegate )f )
.Invoke( split[ 1 ], split[ 2 ], resourceManager, fileDescriptor, priority, isSync, out ret ) ); .Invoke( split[ 1 ], split[ 2 ], resourceManager, fileDescriptor, priority, true, out ret ) );
if( !funcFound ) if( !funcFound )
{ {
ret = DefaultLoadResource( split[ 2 ], resourceManager, fileDescriptor, priority, isSync ); ret = DefaultLoadResource( split[ 2 ], resourceManager, fileDescriptor, priority, true );
} }
// Return original resource handle path so that they can be loaded separately. // Return original resource handle path so that they can be loaded separately.

2
Penumbra/Interop/Structs/FileMode.cs
View file

@ -1,6 +1,6 @@
namespace Penumbra.Interop.Structs; namespace Penumbra.Interop.Structs;
public enum FileMode : uint public enum FileMode : byte
{ {
LoadUnpackedResource = 0, LoadUnpackedResource = 0,
LoadFileResource = 1, // The config files in MyGames use this. LoadFileResource = 1, // The config files in MyGames use this.