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

Pass actor in GearsetDataLoaded instead of looking it up.

Browse source
This commit is contained in:
Ottermandias 2025-04-08 22:53:59 +02:00
parent c0ad4aab51
commit aad978f5f6
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glamourer/Events/GearsetDataLoaded.cs
View file

@ -11,7 +11,7 @@ namespace Glamourer.Events;
/// </list> /// </list>
/// </summary> /// </summary>
public sealed class GearsetDataLoaded() public sealed class GearsetDataLoaded()
: EventWrapper<Model, GearsetDataLoaded.Priority>(nameof(GearsetDataLoaded)) : EventWrapper<Actor, Model, GearsetDataLoaded.Priority>(nameof(GearsetDataLoaded))
{ {
public enum Priority public enum Priority
{ {

2
Glamourer/Interop/UpdateSlotService.cs
View file

@ -120,7 +120,7 @@ public unsafe class UpdateSlotService : IDisposable
{ {
var ret = _loadGearsetDataHook.Original(drawDataContainer, gearsetData); var ret = _loadGearsetDataHook.Original(drawDataContainer, gearsetData);
var drawObject = drawDataContainer->OwnerObject->DrawObject; var drawObject = drawDataContainer->OwnerObject->DrawObject;
GearsetDataLoadedEvent.Invoke(drawObject); GearsetDataLoadedEvent.Invoke(drawDataContainer->OwnerObject, drawObject);
Glamourer.Log.Excessive($"[LoadAllEquipmentDetour] GearsetItemData: {FormatGearsetItemDataStruct(*gearsetData)}"); Glamourer.Log.Excessive($"[LoadAllEquipmentDetour] GearsetItemData: {FormatGearsetItemDataStruct(*gearsetData)}");
return ret; return ret;
} }

5
Glamourer/State/StateListener.cs
View file

@ -264,10 +264,9 @@ public class StateListener : IDisposable
} }
} }
private void OnGearsetDataLoaded(Model model) private void OnGearsetDataLoaded(Actor actor, Model model)
{ {
var actor = _penumbra.GameObjectFromDrawObject(model); if (!actor.Valid || (_condition[ConditionFlag.CreatingCharacter] && actor.Index >= ObjectIndex.CutsceneStart))
if (_condition[ConditionFlag.CreatingCharacter] && actor.Index >= ObjectIndex.CutsceneStart)
return; return;
// ensure actor and state are valid. // ensure actor and state are valid.