Hopefully avoided 'wanna fight popups' after map change, game over, etc

Pyrdacor · Jul 12, 2022 · 04cf37b · 04cf37b
1 parent e583721
commit 04cf37b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/Ambermoon.Core/Game.cs b/Ambermoon.Core/Game.cs
@@ -383,6 +383,7 @@ Position LimitPartyPosition(Position position)
         bool allInputDisabled = false;
         bool inputEnable = true;
         bool paused = false;
+        public bool Fading { get; private set; } = false;
         internal bool ConversationTextActive { get; private set; } = false;
         Func<MouseButtons, bool> nextClickHandler = null;
         /// <summary>
@@ -4737,12 +4738,14 @@ void Shake()
 
         void Fade(Action midFadeAction, bool changeInputEnableState = true)
         {
+            Fading = true;
             if (changeInputEnableState)
                 allInputDisabled = true;
             layout.AddFadeEffect(new Rect(0, 36, Global.VirtualScreenWidth, Global.VirtualScreenHeight - 36), Render.Color.Black, FadeEffectType.FadeInAndOut, FadeTime);
             AddTimedEvent(TimeSpan.FromMilliseconds(FadeTime / 2), midFadeAction);
             if (changeInputEnableState)
                 AddTimedEvent(TimeSpan.FromMilliseconds(FadeTime), () => allInputDisabled = false);
+            AddTimedEvent(TimeSpan.FromMilliseconds(FadeTime + 1), () => Fading = false);
         }
 
         internal void DamageAllPartyMembers(Func<PartyMember, uint> damageProvider, Func<PartyMember, bool> affectChecker = null,

diff --git a/Ambermoon.Core/Render/MapCharacter2D.cs b/Ambermoon.Core/Render/MapCharacter2D.cs
@@ -464,6 +464,9 @@ bool HandleConversation(IConversationPartner conversationPartner)
                         if (game.Teleporting || game.Map != Map.Map)
                             return false;
 
+                        if (game.Fading || game.PopupActive || game.CurrentWindow.Window != UI.Window.MapView)
+                            return false;
+
                         // First set this to max so we won't trigger this again while we are interacting.
                         lastInteractionTicks = uint.MaxValue;
                         interacting = true;

diff --git a/Ambermoon.Core/Render/RenderMap3D.cs b/Ambermoon.Core/Render/RenderMap3D.cs
@@ -312,6 +312,9 @@ bool TriggerCharacterEvents(uint eventIndex)
                         if (game.Teleporting || game.Map != map.Map)
                             return false;
 
+                        if (game.Fading || game.PopupActive || game.CurrentWindow.Window != UI.Window.MapView)
+                            return false;
+
                         // First set this to max so we won't trigger this again while we are interacting.
                         lastInteractionTicks = uint.MaxValue;
                         interacting = true;