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

fixup! Merge branch 'master' into api4-b

Browse source
This commit is contained in:
Ottermandias 2021-09-01 21:48:41 +02:00
parent 34b21c2fde
commit eca00f3f37
3 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Penumbra/Interop/GameResourceManagement.cs
View file

@ -1,10 +1,7 @@
using System; using System;
using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dalamud.Logging; using Dalamud.Logging;
using Dalamud.Plugin;
using Penumbra.Structs; using Penumbra.Structs;
using Reloaded.Hooks.Definitions.X64;
using ResourceHandle = FFXIVClientStructs.FFXIV.Client.System.Resource.Handle.ResourceHandle; using ResourceHandle = FFXIVClientStructs.FFXIV.Client.System.Resource.Handle.ResourceHandle;
namespace Penumbra.Interop namespace Penumbra.Interop

7
Penumbra/Penumbra.csproj
View file

@ -56,13 +56,6 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Net.Http" />
</ItemGroup>
<Target Name="ILRepack" AfterTargets="Build"> <Target Name="ILRepack" AfterTargets="Build">
<ItemGroup> <ItemGroup>
<InputAssemblies Include="$(TargetPath)"/> <InputAssemblies Include="$(TargetPath)"/>

2
Penumbra/UI/MenuTabs/TabResourceManager.cs
View file

@ -91,7 +91,7 @@ namespace Penumbra.UI
return; return;
} }
var resourceHandler = *( ResourceManager** )( _plugin.PluginInterface.TargetModuleScanner.Module.BaseAddress + 0x1D93AC0 ); var resourceHandler = *( ResourceManager** )( Dalamud.SigScanner.Module.BaseAddress + 0x1D93AC0 );
if( resourceHandler == null ) if( resourceHandler == null )
{ {