ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 12:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update CopyCharacterEvent.

Browse source
This commit is contained in:
Ottermandias 2023-10-04 22:02:23 +02:00
parent 53f1efa88b
commit 0aeb407a01
2 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Penumbra/Interop/Services/GameEventManager.cs
View file

@ -24,6 +24,10 @@ public unsafe class GameEventManager : IDisposable
public GameEventManager(IGameInteropProvider interop) public GameEventManager(IGameInteropProvider interop)
{ {
interop.InitializeFromAttributes(this); interop.InitializeFromAttributes(this);
_copyCharacterHook =
interop.HookFromAddress<CopyCharacterDelegate>((nint)CharacterSetup.MemberFunctionPointers.CopyFromCharacter, CopyCharacterDetour);
_characterDtorHook.Enable(); _characterDtorHook.Enable();
_copyCharacterHook.Enable(); _copyCharacterHook.Enable();
_resourceHandleDestructorHook.Enable(); _resourceHandleDestructorHook.Enable();
@ -78,19 +82,20 @@ public unsafe class GameEventManager : IDisposable
#region Copy Character #region Copy Character
private delegate ulong CopyCharacterDelegate(GameObject* target, GameObject* source, uint unk); private delegate ulong CopyCharacterDelegate(CharacterSetup* target, GameObject* source, uint unk);
[Signature(Sigs.CopyCharacter, DetourName = nameof(CopyCharacterDetour))] private readonly Hook<CopyCharacterDelegate> _copyCharacterHook;
private readonly Hook<CopyCharacterDelegate> _copyCharacterHook = null!;
private ulong CopyCharacterDetour(GameObject* target, GameObject* source, uint unk) private ulong CopyCharacterDetour(CharacterSetup* target, GameObject* source, uint unk)
{ {
// TODO: update when CS updated.
var character = ((Character**)target)[1];
if (CopyCharacter != null) if (CopyCharacter != null)
foreach (var subscriber in CopyCharacter.GetInvocationList()) foreach (var subscriber in CopyCharacter.GetInvocationList())
{ {
try try
{ {
((CopyCharacterEvent)subscriber).Invoke((Character*)target, (Character*)source); ((CopyCharacterEvent)subscriber).Invoke(character, (Character*)source);
} }
catch (Exception ex) catch (Exception ex)
{ {

24
Penumbra/Interop/Services/RedrawService.cs
View file

@ -1,4 +1,3 @@
using Dalamud.Game;
using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Objects; using Dalamud.Game.ClientState.Objects;
using Dalamud.Game.ClientState.Objects.Enums; using Dalamud.Game.ClientState.Objects.Enums;
@ -20,8 +19,10 @@ public unsafe partial class RedrawService
public const int GPoseEndIdx = GPosePlayerIdx + GPoseSlots; public const int GPoseEndIdx = GPosePlayerIdx + GPoseSlots;
private readonly string?[] _gPoseNames = new string?[GPoseSlots]; private readonly string?[] _gPoseNames = new string?[GPoseSlots];
private int _gPoseNameCounter = 0; private int _gPoseNameCounter;
private bool _inGPose = false;
private bool InGPose
=> _clientState.IsGPosing;
// VFuncs that disable and enable draw, used only for GPose actors. // VFuncs that disable and enable draw, used only for GPose actors.
private static void DisableDraw(GameObject actor) private static void DisableDraw(GameObject actor)
@ -33,10 +34,7 @@ public unsafe partial class RedrawService
// Check whether we currently are in GPose. // Check whether we currently are in GPose.
// Also clear the name list. // Also clear the name list.
private void SetGPose() private void SetGPose()
{ => _gPoseNameCounter = 0;
_inGPose = _objects[GPosePlayerIdx] != null;
_gPoseNameCounter = 0;
}
private static bool IsGPoseActor(int idx) private static bool IsGPoseActor(int idx)
=> idx is >= GPosePlayerIdx and < GPoseEndIdx; => idx is >= GPosePlayerIdx and < GPoseEndIdx;
@ -50,7 +48,7 @@ public unsafe partial class RedrawService
private bool FindCorrectActor(int idx, out GameObject? obj) private bool FindCorrectActor(int idx, out GameObject? obj)
{ {
obj = _objects[idx]; obj = _objects[idx];
if (!_inGPose || obj == null || IsGPoseActor(idx)) if (!InGPose || obj == null || IsGPoseActor(idx))
return false; return false;
var name = obj.Name.ToString(); var name = obj.Name.ToString();
@ -100,10 +98,11 @@ public unsafe partial class RedrawService
public sealed unsafe partial class RedrawService : IDisposable public sealed unsafe partial class RedrawService : IDisposable
{ {
private readonly IFramework _framework; private readonly IFramework _framework;
private readonly IObjectTable _objects; private readonly IObjectTable _objects;
private readonly ITargetManager _targets; private readonly ITargetManager _targets;
private readonly ICondition _conditions; private readonly ICondition _conditions;
private readonly IClientState _clientState;
private readonly List<int> _queue = new(100); private readonly List<int> _queue = new(100);
private readonly List<int> _afterGPoseQueue = new(GPoseSlots); private readonly List<int> _afterGPoseQueue = new(GPoseSlots);
@ -111,12 +110,13 @@ public sealed unsafe partial class RedrawService : IDisposable
public event GameObjectRedrawnDelegate? GameObjectRedrawn; public event GameObjectRedrawnDelegate? GameObjectRedrawn;
public RedrawService(IFramework framework, IObjectTable objects, ITargetManager targets, ICondition conditions) public RedrawService(IFramework framework, IObjectTable objects, ITargetManager targets, ICondition conditions, IClientState clientState)
{ {
_framework = framework; _framework = framework;
_objects = objects; _objects = objects;
_targets = targets; _targets = targets;
_conditions = conditions; _conditions = conditions;
_clientState = clientState;
_framework.Update += OnUpdateEvent; _framework.Update += OnUpdateEvent;
} }
@ -241,7 +241,7 @@ public sealed unsafe partial class RedrawService : IDisposable
private void HandleAfterGPose() private void HandleAfterGPose()
{ {
if (_afterGPoseQueue.Count == 0 || _inGPose) if (_afterGPoseQueue.Count == 0 || InGPose)
return; return;
var numKept = 0; var numKept = 0;