ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/master' into net8-rollup

Browse source
This commit is contained in:
github-actions[bot] 2023-11-19 12:32:38 +00:00
commit 7e1d006a5f
4 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/rollup.yml vendored
View file

@ -1,8 +1,8 @@
name: Rollup changes to next version name: Rollup changes to next version
on: on:
# push: push:
# branches: branches:
# - master - master
workflow_dispatch: workflow_dispatch:
jobs: jobs:
@ -11,7 +11,8 @@ jobs:
strategy: strategy:
matrix: matrix:
branches: branches:
- v9 - net8
#- new_im_hooks # Unmergeable
defaults: defaults:
run: run:

2
Dalamud/Dalamud.csproj
View file

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Feature"> <PropertyGroup Label="Feature">
<DalamudVersion>9.0.0.12</DalamudVersion> <DalamudVersion>9.0.0.13</DalamudVersion>
<Description>XIV Launcher addon framework</Description> <Description>XIV Launcher addon framework</Description>
<AssemblyVersion>$(DalamudVersion)</AssemblyVersion> <AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
<Version>$(DalamudVersion)</Version> <Version>$(DalamudVersion)</Version>

14
Dalamud/Game/Gui/FlyText/FlyTextGui.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -119,12 +118,8 @@ internal sealed class FlyTextGui : IDisposable, IServiceType, IFlyTextGui
numArray->IntArray[numOffset + 8] = 0; // Unknown numArray->IntArray[numOffset + 8] = 0; // Unknown
numArray->IntArray[numOffset + 9] = 0; // Unknown, has something to do with yOffset numArray->IntArray[numOffset + 9] = 0; // Unknown, has something to do with yOffset
fixed (byte* pText1 = text1.Encode()) strArray->SetValue((int)strOffset + 0, text1.Encode(), false, true, false);
{ strArray->SetValue((int)strOffset + 1, text2.Encode(), false, true, false);
fixed (byte* pText2 = text2.Encode())
{
strArray->StringArray[strOffset + 0] = pText1;
strArray->StringArray[strOffset + 1] = pText2;
this.addFlyTextNative( this.addFlyTextNative(
flytext, flytext,
@ -138,8 +133,6 @@ internal sealed class FlyTextGui : IDisposable, IServiceType, IFlyTextGui
2, 2,
0); 0);
} }
}
}
private static byte[] Terminate(byte[] source) private static byte[] Terminate(byte[] source)
{ {
@ -230,7 +223,8 @@ internal sealed class FlyTextGui : IDisposable, IServiceType, IFlyTextGui
if (!dirty) if (!dirty)
{ {
Log.Verbose("[FlyText] Calling flytext with original args."); Log.Verbose("[FlyText] Calling flytext with original args.");
return this.createFlyTextHook.Original(addonFlyText, kind, val1, val2, text2, color, icon, damageTypeIcon, text1, yOffset); return this.createFlyTextHook.Original(addonFlyText, kind, val1, val2, text2, color, icon,
damageTypeIcon, text1, yOffset);
} }
var terminated1 = Terminate(tmpText1.Encode()); var terminated1 = Terminate(tmpText1.Encode());