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

Fix statesource overwriting data for characterweapon.

Browse source
This commit is contained in:
Ottermandias 2024-07-20 23:42:29 +02:00
parent 94b7ea2d9d
commit a7f36da3f5
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Glamourer/Interop/Material/MaterialValueManager.cs
View file

@ -176,7 +176,6 @@ public struct MaterialValueDesign(ColorRow value, bool enabled, bool revert)
}
}
[StructLayout(LayoutKind.Explicit)]
public struct MaterialValueState(
in ColorRow game,
in ColorRow model,
@ -187,17 +186,10 @@ public struct MaterialValueState(
: this(gameRow, modelRow, armor.ToWeapon(0), source)
{ }
[FieldOffset(0)]
public ColorRow Game = game;
[FieldOffset(44)]
public ColorRow Model = model;
[FieldOffset(88)]
public ColorRow Game = game;
public ColorRow Model = model;
public readonly CharacterWeapon DrawData = drawData;
[FieldOffset(95)]
public readonly StateSource Source = source;
public readonly StateSource Source = source;
public readonly bool EqualGame(in ColorRow rhsRow, CharacterWeapon rhsData)
=> DrawData.Skeleton == rhsData.Skeleton