Maybe fix visor state issue.

Ottermandias · Apr 4, 2024 · 8375abd · 8375abd
1 parent 3d42188
commit 8375abd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Glamourer/Events/VisorStateChanged.cs b/Glamourer/Events/VisorStateChanged.cs
@@ -12,7 +12,7 @@ namespace Glamourer.Events;
 /// </list>
 /// </summary>
 public sealed class VisorStateChanged()
-    : EventWrapperRef2<Model, bool, VisorStateChanged.Priority>(nameof(VisorStateChanged))
+    : EventWrapperRef3<Model, bool, bool, VisorStateChanged.Priority>(nameof(VisorStateChanged))
 {
     public enum Priority
     {

diff --git a/Glamourer/Interop/MetaService.cs b/Glamourer/Interop/MetaService.cs
@@ -93,7 +93,7 @@ private void HideWeaponsDetour(DrawDataContainer* drawData, bool value)
     private void ToggleVisorDetour(DrawDataContainer* drawData, bool value)
     {
         Actor actor = drawData->Parent;
-        _visorEvent.Invoke(actor.Model, ref value);
+        _visorEvent.Invoke(actor.Model, true, ref value);
         Glamourer.Log.Verbose($"[MetaService] Toggle Visor triggered with 0x{(nint)drawData:X} {value} for {actor.Utf8Name}.");
         _toggleVisorHook.Original(drawData, value);
     }

diff --git a/Glamourer/Interop/VisorService.cs b/Glamourer/Interop/VisorService.cs
@@ -52,7 +52,7 @@ private void SetupVisorDetour(nint human, ushort modelId, bool on)
         var originalOn = on;
         // Invoke an event that can change the requested value
         // and also control whether the function should be called at all.
-        Event.Invoke(human, ref on);
+        Event.Invoke(human, false, ref on);
 
         Glamourer.Log.Excessive(
             $"[SetVisorState] Invoked from game on 0x{human:X} switching to {on} (original {originalOn}).");

diff --git a/Glamourer/State/StateListener.cs b/Glamourer/State/StateListener.cs
@@ -568,7 +568,7 @@ private unsafe UpdateState UpdateBaseData(Actor actor, ActorState state, Customi
     }
 
     /// <summary> Handle visor state changes made by the game. </summary>
-    private void OnVisorChange(Model model, ref bool value)
+    private unsafe void OnVisorChange(Model model, bool game, ref bool value)
     {
         // Skip updates when in customize update.
         if (ChangeCustomizeService.InUpdate.InMethod)
@@ -578,6 +578,13 @@ private void OnVisorChange(Model model, ref bool value)
         // We do not need to handle fixed designs,
         // since a fixed design would already have established state-tracking.
         var actor = _penumbra.GameObjectFromDrawObject(model);
+
+        // Only actually change anything if the actor state changed,
+        // when equipping headgear the method is called with the current draw object state,
+        // which corrupts Glamourer's assumed game state otherwise.
+        if (!game && actor.AsCharacter->DrawData.IsVisorToggled != value)
+            return;
+
         if (_condition[ConditionFlag.CreatingCharacter] && actor.Index >= ObjectIndex.CutsceneStart)
             return;