Skip to content

Commit 51bef1d

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 4561519 + 82ae46d commit 51bef1d

4 files changed

Lines changed: 66 additions & 17 deletions

File tree

FFXIVClientStructs/FFXIV/Client/Game/Control/Control.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public unsafe partial struct Control {
1313
[FieldOffset(0x00)] public CameraManager CameraManager;
1414
[FieldOffset(0x190)] public TargetSystem TargetSystem;
1515

16-
[FieldOffset(0x7633)] public bool IsWalking;
16+
[FieldOffset(0x7518)] public bool IsWalkingDuringAutorun;
17+
[FieldOffset(0x7637)] public bool IsWalking;
1718
[FieldOffset(0x7698)] public uint LocalPlayerEntityId;
1819
[FieldOffset(0x76A0)] public BattleChara* LocalPlayer;
1920
[FieldOffset(0x76B0)] public Matrix4x4 ViewProjectionMatrix;

FFXIVClientStructs/FFXIV/Client/UI/Misc/ItemFinderModule.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using FFXIVClientStructs.FFXIV.Client.Game.UI;
12
using UserFileEvent = FFXIVClientStructs.FFXIV.Client.UI.Misc.UserFileManager.UserFileEvent;
23

34
namespace FFXIVClientStructs.FFXIV.Client.UI.Misc;
@@ -15,7 +16,9 @@ public unsafe partial struct ItemFinderModule {
1516

1617
[FieldOffset(0x48), FixedSizeArray] internal FixedSizeArray24<uint> _requestItemIds;
1718
[FieldOffset(0xA8)] public bool IsRequestUnfulfilled;
18-
[FieldOffset(0xA9)] public bool IsCabinetCached;
19+
/// <remarks> See <see cref="Cabinet.CabinetState"/> </remarks>
20+
[FieldOffset(0xA9)] public byte CabinetState;
21+
[FieldOffset(0xA9), Obsolete("Invalid type. Use CabinetState.", true)] public bool IsCabinetCached;
1922
[FieldOffset(0xAA)] public bool IsRetainerManagerReady; // only temporary set to true until request is complete
2023
[FieldOffset(0xAB)] public bool IsSaddleBagCached;
2124
[FieldOffset(0xAC)] public bool IsGlamourDresserCached;

ida/data.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5487,8 +5487,6 @@ classes:
54875487
0x14047B5E0: Finalizer
54885488
0x14047C030: CreateFileThread
54895489
Client::System::File::FileAccessPath:
5490-
vtbls:
5491-
- ea: 0x142164CE8
54925490
funcs:
54935491
0x1400955B0: ctor
54945492
0x1400955D0: ctor_FromUtf8String

ida/ffxiv_structs.yml

Lines changed: 60 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)