Fix corpse graphics from CUO/Spasitjel

jsebold666 · Feb 24, 2024 · 64df25c · 64df25c
1 parent 5938841
commit 64df25c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/ClassicUO.Client/Game/GameObjects/Views/ItemView.cs b/src/ClassicUO.Client/Game/GameObjects/Views/ItemView.cs
@@ -205,7 +205,7 @@ float depth
  byte animIndex = (byte)AnimIndex;
  ushort graphic = GetGraphicForAnimation();
 
- Client.Game.Animations.ConvertBodyIfNeeded(ref graphic);
+ Client.Game.Animations.ConvertBodyIfNeeded(ref graphic, isCorpse: IsCorpse);
  var animGroup = Client.Game.Animations.GetAnimType(graphic);
  var animFlags = Client.Game.Animations.GetAnimFlags(graphic);
  byte group = AnimationsLoader.Instance.GetDeathAction(
@@ -603,7 +603,7 @@ out Dictionary<ushort, EquipConvData> map
  continue;
  }
 
- Client.Game.Animations.ConvertBodyIfNeeded(ref graphic);
+ Client.Game.Animations.ConvertBodyIfNeeded(ref graphic, isCorpse: IsCorpse);
  var animGroup = Client.Game.Animations.GetAnimType(graphic);
  var animFlags = Client.Game.Animations.GetAnimFlags(graphic);
  byte group = AnimationsLoader.Instance.GetDeathAction(
@@ -617,7 +617,9 @@ out Dictionary<ushort, EquipConvData> map
  group,
  direction,
  out _,
- out var isUOP
+ out var isUOP,
+ false,
+ IsCorpse
  );
 
  if (frames.IsEmpty)

diff --git a/src/ClassicUO.Renderer/Animations/Animation.cs b/src/ClassicUO.Renderer/Animations/Animation.cs
@@ -342,7 +342,8 @@ public void UpdateAnimationTable(BodyConvFlags flags)
  public void ConvertBodyIfNeeded(
  ref ushort graphic,
  bool isParent = false,
- bool forceUOP = false
+ bool forceUOP = false,
+ bool isCorpse = false
  )
  {
  if (graphic >= _dataIndex.Length)
@@ -351,7 +352,9 @@ public void ConvertBodyIfNeeded(
  ushort hue = 0;
 
  if (_dataIndex[graphic] != null && _dataIndex[graphic].FileIndex == 0 && !_dataIndex[graphic].Flags.HasFlag(AnimationFlags.UseUopAnimation))
- AnimationsLoader.Instance.ReplaceBody(ref graphic, ref hue);
+ {
+ _ = isCorpse ? AnimationsLoader.Instance.ReplaceCorpse(ref graphic, ref hue) : AnimationsLoader.Instance.ReplaceBody(ref graphic, ref hue);
+ }
  }
 
  public bool AnimationExists(ushort graphic, byte group, bool isCorpse = false)