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

Update ClientStructs (#1827)

Browse source
This commit is contained in:
Haselnussbomber 2024-06-16 01:57:44 +02:00 • committed by GitHub
parent e06057f308
commit 7ddc5d82ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/ClientState/Objects/Types/BattleChara.cs
View file

@ -46,7 +46,7 @@ public unsafe class BattleChara : Character
/// <summary> /// <summary>
/// Gets the object ID of the target currently being cast at by the chara. /// Gets the object ID of the target currently being cast at by the chara.
/// </summary> /// </summary>
public ulong CastTargetObjectId => this.Struct->GetCastInfo()->CastTargetId; public ulong CastTargetObjectId => this.Struct->GetCastInfo()->TargetId;
/// <summary> /// <summary>
/// Gets the current casting time of the spell being cast by the chara. /// Gets the current casting time of the spell being cast by the chara.

2
Dalamud/Game/ClientState/Objects/Types/GameObject.cs
View file

@ -99,7 +99,7 @@ public unsafe partial class GameObject
/// ///
/// Not to be confused with <see cref="EntityId"/>. /// Not to be confused with <see cref="EntityId"/>.
/// </summary> /// </summary>
public ulong GameObjectId => this.Struct->GetObjectId(); public ulong GameObjectId => this.Struct->GetGameObjectId();
/// <summary> /// <summary>
/// Gets the Entity ID for this GameObject. Entity IDs are assigned to networked GameObjects. /// Gets the Entity ID for this GameObject. Entity IDs are assigned to networked GameObjects.

2
Dalamud/Game/Gui/ContextMenu/ContextMenu.cs
View file

@ -17,8 +17,6 @@ using FFXIVClientStructs.FFXIV.Client.System.Memory;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
using FFXIVClientStructs.FFXIV.Component.GUI.AtkModuleInterface;
using FFXIVClientStructs.Interop;
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType; using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;

6
Dalamud/Game/Gui/Dtr/DtrBar.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -274,7 +274,7 @@ internal sealed unsafe class DtrBar : IInternalDisposableService, IDtrBar
foreach (var index in Enumerable.Range(0, addon->UldManager.NodeListCount)) foreach (var index in Enumerable.Range(0, addon->UldManager.NodeListCount))
{ {
var node = addon->UldManager.NodeList[index]; var node = addon->UldManager.NodeList[index];
if (node->IsVisible) if (node->IsVisible())
{ {
var nodeId = node->NodeId; var nodeId = node->NodeId;
var nodeType = node->Type; var nodeType = node->Type;
@ -289,7 +289,7 @@ internal sealed unsafe class DtrBar : IInternalDisposableService, IDtrBar
additionalWidth += node->Width + this.configuration.DtrSpacing; additionalWidth += node->Width + this.configuration.DtrSpacing;
} }
else if ((nodeType == NodeType.Res || (ushort)nodeType >= 1000) && else if ((nodeType == NodeType.Res || (ushort)nodeType >= 1000) &&
(node->ChildNode == null || node->ChildNode->IsVisible)) (node->ChildNode == null || node->ChildNode->IsVisible()))
{ {
// Native top-level node. These are are either res nodes or button components. // Native top-level node. These are are either res nodes or button components.
// Both the node and its child (if it has one) must be visible for the node to be counted. // Both the node and its child (if it has one) must be visible for the node to be counted.

6
Dalamud/Interface/Internal/UiDebug.cs
View file

@ -79,7 +79,7 @@ internal unsafe class UiDebug
private void DrawUnitBase(AtkUnitBase* atkUnitBase) private void DrawUnitBase(AtkUnitBase* atkUnitBase)
{ {
var isVisible = (atkUnitBase->Flags & 0x20) == 0x20; var isVisible = atkUnitBase->IsVisible;
var addonName = atkUnitBase->NameString; var addonName = atkUnitBase->NameString;
var agent = Service<GameGui>.Get().FindAgentInterface(atkUnitBase); var agent = Service<GameGui>.Get().FindAgentInterface(atkUnitBase);
@ -92,7 +92,7 @@ internal unsafe class UiDebug
ImGui.SameLine(ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - 25); ImGui.SameLine(ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - 25);
if (ImGui.SmallButton("V")) if (ImGui.SmallButton("V"))
{ {
atkUnitBase->Flags ^= 0x20; atkUnitBase->IsVisible = !atkUnitBase->IsVisible;
} }
ImGui.Separator(); ImGui.Separator();
@ -487,7 +487,7 @@ internal unsafe class UiDebug
if (headerOpen) if (headerOpen)
{ {
var visible = (unitBase->Flags & 0x20) == 0x20; var visible = unitBase->IsVisible;
ImGui.PushStyleColor(ImGuiCol.Text, visible ? 0xFF00FF00 : 0xFF999999); ImGui.PushStyleColor(ImGuiCol.Text, visible ? 0xFF00FF00 : 0xFF999999);
if (ImGui.Selectable($"{name}##list{i}-{(ulong)unitBase:X}_{j}", this.selectedUnitBase == unitBase)) if (ImGui.Selectable($"{name}##list{i}-{(ulong)unitBase:X}_{j}", this.selectedUnitBase == unitBase))

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit d0cbe19f145bcae573a1eb2313f1f8240f869cd7 Subproject commit 7e5e2b6ae9513d3ab2bcc5891e6ccfdb38bf45f3