anna
/
SoundFilter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: update to 6.0

This commit is contained in:
Anna 2021-12-08 06:09:04 -05:00
parent 5ae8d605f1
commit bd3e22b6c1
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SoundFilter/Filter.cs
View File

@ -121,9 +121,9 @@ namespace SoundFilter {
// write a pointer to the empty scd // write a pointer to the empty scd
Marshal.WriteIntPtr(infoPtr + 8, noSoundPtr); Marshal.WriteIntPtr(infoPtr + 8, noSoundPtr);
// specify where the game should offset from for the sound index // specify where the game should offset from for the sound index
Marshal.WriteInt32(infoPtr + 0x90, 0x54); Marshal.WriteInt32(infoPtr + 0x88, 0x54);
// specify the number of sounds in the file // specify the number of sounds in the file
Marshal.WriteInt16(infoPtr + 0x9C, 0); Marshal.WriteInt16(infoPtr + 0x94, 0);
return (noSoundPtr, infoPtr); return (noSoundPtr, infoPtr);
} }
@ -175,6 +175,7 @@ namespace SoundFilter {
var shouldFilter = this.PlaySpecificSoundDetourInner(a1, idx); var shouldFilter = this.PlaySpecificSoundDetourInner(a1, idx);
if (shouldFilter) { if (shouldFilter) {
a1 = (long) this.InfoPtr; a1 = (long) this.InfoPtr;
idx = 0;
} }
} catch (Exception ex) { } catch (Exception ex) {
PluginLog.LogError(ex, "Error in PlaySpecificSoundDetour"); PluginLog.LogError(ex, "Error in PlaySpecificSoundDetour");

6
SoundFilter/SoundFilter.csproj
View File

@ -57,9 +57,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DalamudPackager" Version="2.1.2"/> <PackageReference Include="DalamudPackager" Version="2.1.5"/>
<PackageReference Include="DotNet.Glob" Version="3.1.2"/> <PackageReference Include="DotNet.Glob" Version="3.1.3"/>
<PackageReference Include="Fody" Version="6.5.2" PrivateAssets="all"/> <PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all"/>
<PackageReference Include="Resourcer.Fody" Version="1.8.0" PrivateAssets="all"/> <PackageReference Include="Resourcer.Fody" Version="1.8.0" PrivateAssets="all"/>
</ItemGroup> </ItemGroup>

1
SoundFilter/Ui/Settings.cs
View File

@ -136,6 +136,7 @@ namespace SoundFilter.Ui {
if (drag != null && drag.Value.dst < this.Plugin.Config.Filters.Count && drag.Value.dst >= 0) { if (drag != null && drag.Value.dst < this.Plugin.Config.Filters.Count && drag.Value.dst >= 0) {
this._dragging = drag.Value.dst; this._dragging = drag.Value.dst;
// ReSharper disable once SwapViaDeconstruction
var temp = this.Plugin.Config.Filters[drag.Value.src]; var temp = this.Plugin.Config.Filters[drag.Value.src];
this.Plugin.Config.Filters[drag.Value.src] = this.Plugin.Config.Filters[drag.Value.dst]; this.Plugin.Config.Filters[drag.Value.src] = this.Plugin.Config.Filters[drag.Value.dst];
this.Plugin.Config.Filters[drag.Value.dst] = temp; this.Plugin.Config.Filters[drag.Value.dst] = temp;