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

deps: bump clientstructs (#2217)

Browse source 
- and fix the errors
This commit is contained in:
KazWolfe 2025-03-27 16:48:12 -07:00 • committed by GitHub
parent 6dddfa1597
commit 9c80b72e5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/ClientState/Fates/Fate.cs
View file

@ -249,5 +249,5 @@ internal unsafe partial class Fate : IFate
/// <summary> /// <summary>
/// Gets the territory this <see cref="Fate"/> is located in. /// Gets the territory this <see cref="Fate"/> is located in.
/// </summary> /// </summary>
public RowRef<Lumina.Excel.Sheets.TerritoryType> TerritoryType => LuminaUtils.CreateRef<Lumina.Excel.Sheets.TerritoryType>(this.Struct->TerritoryId); public RowRef<Lumina.Excel.Sheets.TerritoryType> TerritoryType => LuminaUtils.CreateRef<Lumina.Excel.Sheets.TerritoryType>(this.Struct->MapMarkers[0].TerritoryId);
} }

5
Dalamud/Game/Gui/NamePlate/NamePlateUpdateContext.cs
View file

@ -1,6 +1,7 @@
using Dalamud.Game.ClientState.Objects; using Dalamud.Game.ClientState.Objects;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Client.UI.Arrays;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
namespace Dalamud.Game.Gui.NamePlate; namespace Dalamud.Game.Gui.NamePlate;
@ -124,7 +125,7 @@ internal unsafe class NamePlateUpdateContext : INamePlateUpdateContext
/// <summary> /// <summary>
/// Gets a pointer to the NamePlate addon's number array entries as a struct. /// Gets a pointer to the NamePlate addon's number array entries as a struct.
/// </summary> /// </summary>
internal AddonNamePlate.AddonNamePlateNumberArray* NumberStruct { get; private set; } internal NamePlateNumberArray* NumberStruct { get; private set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether any handler in the current context has instantiated a part builder. /// Gets or sets a value indicating whether any handler in the current context has instantiated a part builder.
@ -141,7 +142,7 @@ internal unsafe class NamePlateUpdateContext : INamePlateUpdateContext
{ {
this.Addon = (AddonNamePlate*)addon; this.Addon = (AddonNamePlate*)addon;
this.NumberData = AtkStage.Instance()->GetNumberArrayData(NumberArrayType.NamePlate); this.NumberData = AtkStage.Instance()->GetNumberArrayData(NumberArrayType.NamePlate);
this.NumberStruct = (AddonNamePlate.AddonNamePlateNumberArray*)this.NumberData->IntArray; this.NumberStruct = (NamePlateNumberArray*)this.NumberData->IntArray;
this.StringData = AtkStage.Instance()->GetStringArrayData(StringArrayType.NamePlate); this.StringData = AtkStage.Instance()->GetStringArrayData(StringArrayType.NamePlate);
this.HasParts = false; this.HasParts = false;

3
Dalamud/Game/Gui/NamePlate/NamePlateUpdateHandler.cs
View file

@ -7,6 +7,7 @@ using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Client.UI.Arrays;
using FFXIVClientStructs.Interop; using FFXIVClientStructs.Interop;
namespace Dalamud.Game.Gui.NamePlate; namespace Dalamud.Game.Gui.NamePlate;
@ -503,7 +504,7 @@ internal unsafe class NamePlateUpdateHandler : INamePlateUpdateHandler
private AddonNamePlate.NamePlateObject* NamePlateObject => private AddonNamePlate.NamePlateObject* NamePlateObject =>
&this.context.Addon->NamePlateObjectArray[this.NamePlateIndex]; &this.context.Addon->NamePlateObjectArray[this.NamePlateIndex];
private AddonNamePlate.AddonNamePlateNumberArray.NamePlateObjectIntArrayData* ObjectData => private NamePlateNumberArray.NamePlateObjectIntArrayData* ObjectData =>
this.context.NumberStruct->ObjectData.GetPointer(this.ArrayIndex); this.context.NumberStruct->ObjectData.GetPointer(this.ArrayIndex);
/// <inheritdoc/> /// <inheritdoc/>

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit 40565ddff870f5f267e0973d21008a7dd718f8ee Subproject commit 0d2db9a66b676792fd0a44280d40f5b58cc3522e