ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-18 13:57:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix right rings and set status not being correctly checked by actorwatcher.

Browse source
This commit is contained in:
Ottermandias 2021-07-11 01:04:59 +02:00
parent b05ff66773
commit 25f901bb7c
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Penumbra/Game/CharEquipment.cs
View file

@ -38,7 +38,6 @@ namespace Penumbra.Game
private const int EquipmentSlots = 10; private const int EquipmentSlots = 10;
private const int WeaponSlots = 2; private const int WeaponSlots = 2;
private readonly ushort IsSet; // Also fills struct size to 56, a multiple of 8.
internal readonly Weapon Mainhand; internal readonly Weapon Mainhand;
internal readonly Weapon Offhand; internal readonly Weapon Offhand;
internal readonly Equip Head; internal readonly Equip Head;
@ -51,6 +50,7 @@ namespace Penumbra.Game
internal readonly Equip Wrist; internal readonly Equip Wrist;
internal readonly Equip LFinger; internal readonly Equip LFinger;
internal readonly Equip RFinger; internal readonly Equip RFinger;
internal readonly ushort IsSet; // Also fills struct size to 56, a multiple of 8.
public CharEquipment() public CharEquipment()
=> Clear(); => Clear();
@ -97,7 +97,7 @@ namespace Penumbra.Game
{ {
fixed( Weapon* main = &Mainhand ) fixed( Weapon* main = &Mainhand )
{ {
var structSizeEights = ( EquipmentSlots * sizeof( Equip ) + WeaponSlots * sizeof( Weapon ) ) / 8; var structSizeEights = ( 2 + EquipmentSlots * sizeof( Equip ) + WeaponSlots * sizeof( Weapon ) ) / 8;
for( ulong* ptr = ( ulong* )main, end = ptr + structSizeEights; ptr != end; ++ptr ) for( ulong* ptr = ( ulong* )main, end = ptr + structSizeEights; ptr != end; ++ptr )
{ {
*ptr = 0; *ptr = 0;
@ -107,13 +107,13 @@ namespace Penumbra.Game
private unsafe bool CompareAndOverwrite( CharEquipment rhs ) private unsafe bool CompareAndOverwrite( CharEquipment rhs )
{ {
var structSizeHalf = ( EquipmentSlots * sizeof( Equip ) + WeaponSlots * sizeof( Weapon ) ) / 8; var structSizeEights = ( 2 + EquipmentSlots * sizeof( Equip ) + WeaponSlots * sizeof( Weapon ) ) / 8;
var ret = true; var ret = true;
fixed( Weapon* data1 = &Mainhand, data2 = &rhs.Mainhand ) fixed( Weapon* data1 = &Mainhand, data2 = &rhs.Mainhand )
{ {
var ptr1 = ( ulong* )data1; var ptr1 = ( ulong* )data1;
var ptr2 = ( ulong* )data2; var ptr2 = ( ulong* )data2;
for( var end = ptr1 + structSizeHalf; ptr1 != end; ++ptr1, ++ptr2 ) for( var end = ptr1 + structSizeEights; ptr1 != end; ++ptr1, ++ptr2 )
{ {
if( *ptr1 != *ptr2 ) if( *ptr1 != *ptr2 )
{ {
@ -128,12 +128,12 @@ namespace Penumbra.Game
private unsafe bool CompareData( CharEquipment rhs ) private unsafe bool CompareData( CharEquipment rhs )
{ {
var structSizeHalf = ( EquipmentSlots * sizeof( Equip ) + WeaponSlots * sizeof( Weapon ) ) / 8; var structSizeEights = ( 2 + EquipmentSlots * sizeof( Equip ) + WeaponSlots * sizeof( Weapon ) ) / 8;
fixed( Weapon* data1 = &Mainhand, data2 = &rhs.Mainhand ) fixed( Weapon* data1 = &Mainhand, data2 = &rhs.Mainhand )
{ {
var ptr1 = ( ulong* )data1; var ptr1 = ( ulong* )data1;
var ptr2 = ( ulong* )data2; var ptr2 = ( ulong* )data2;
for( var end = ptr1 + structSizeHalf; ptr1 != end; ++ptr1, ++ptr2 ) for( var end = ptr1 + structSizeEights; ptr1 != end; ++ptr1, ++ptr2 )
{ {
if( *ptr1 != *ptr2 ) if( *ptr1 != *ptr2 )
{ {

4
Penumbra/UI/MenuTabs/TabDebug.cs
View file

@ -58,6 +58,10 @@ namespace Penumbra.UI
ImGui.TableNextRow(); ImGui.TableNextRow();
ImGui.TableNextColumn(); ImGui.TableNextColumn();
if (actor.Value.IsSet == 0)
{
ImGui.Text( "(not set)" );
}
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.Text( identifier.Identify( actor.Value.Mainhand._1, actor.Value.Mainhand._2, actor.Value.Mainhand._3, EquipSlot.MainHand )?.Name.ToString() ?? "Unknown" ); ImGui.Text( identifier.Identify( actor.Value.Mainhand._1, actor.Value.Mainhand._2, actor.Value.Mainhand._3, EquipSlot.MainHand )?.Name.ToString() ?? "Unknown" );
ImGui.TableNextColumn(); ImGui.TableNextColumn();