From 1944c5bd943221e14b011a30e0c77a978f8784ab Mon Sep 17 00:00:00 2001
From: Shtoyan <shtoyan@yahoo.com>
Date: Tue, 19 Jul 2022 20:11:43 +0400
Subject: [PATCH] better input handling during initial trader

---
 sources/GUI/NiceInteraction.uc | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/sources/GUI/NiceInteraction.uc b/sources/GUI/NiceInteraction.uc
index 1ea9685..93b4360 100644
--- a/sources/GUI/NiceInteraction.uc
+++ b/sources/GUI/NiceInteraction.uc
@@ -482,23 +482,24 @@ function bool KeyEvent(EInputKey Key, EInputAction Action, float Delta)
        }
     }
 
-    // Open trader on movement
-    if (Alias ~= "MoveForward" || Alias ~= "MoveBackward" || Alias ~= "TurnLeft" || Alias ~= "TurnRight"
-        || Alias ~= "StrafeLeft" || Alias ~= "StrafeRight" || Alias ~= "Axis")
+    // Open trader on movement if it's a pre-game
+    if (NicePackMutator.bIsPreGame && NicePackMutator.bInitialTrader && (NicePackMutator.bStillDuringInitTrader || !nicePlayer.bOpenedInitTrader) && nicePlayer.Pawn != none)
     {
-       // Open trader if it's a pre-game
-       if (NicePackMutator.bIsPreGame && NicePackMutator.bInitialTrader && (NicePackMutator.bStillDuringInitTrader || !nicePlayer.bOpenedInitTrader) && nicePlayer.Pawn != none)
-       {
-           nicePlayer.ShowBuyMenu("Initial trader", KFHumanPawn(nicePlayer.Pawn).MaxCarryWeight);
-           nicePlayer.bOpenedInitTrader = true;
-           return true;
-       }
-       // nicePlayer.ClientOpenMenu("NicePack.NiceGUIBuyMenu",,"Test stuff",string(15));
+        if (Alias ~= "MoveForward" || Alias ~= "MoveBackward" || Alias ~= "TurnLeft" || Alias ~= "TurnRight"
+            || Alias ~= "StrafeLeft" || Alias ~= "StrafeRight" || Alias ~= "Axis")
+        {
+            // nicePlayer.ClientOpenMenu("NicePack.NiceGUIBuyMenu",,"Test stuff",string(15));
+            nicePlayer.ShowBuyMenu("Initial trader", KFHumanPawn(nicePlayer.Pawn).MaxCarryWeight);
+            nicePlayer.bOpenedInitTrader = true;
+            return true;
+        }
     }
+
     // Reload if we've detected a reload alias in this button's command
     if (niceWeap != none && !nicePlayer.bUseServerReload &&
         (bNeedsReload || Alias ~= "ReloadMeNow" || Alias ~= "ReloadWeapon"))
        niceWeap.ClientReloadMeNow();
+
     return false;
 }