Map vote screen: capture and ignore key release events; it prevents triggering -...

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 5be42cda965546119a7f2ef45425de9889cca315..0d2db8724640986bfa29c1a6d687a73cbd493dbf 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -812,13 +812,19 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
                return true;
        }
 
-       if (bInputType == 0)
+       if (bInputType == 2)
+               return false;
+
+       // at this point bInputType can be 0 or 1 (key pressed or released)
+       bool key_pressed = (bInputType == 0);
+
+       if (key_pressed)
        {
                if (nPrimary == K_ALT) hudShiftState |= S_ALT;
                if (nPrimary == K_CTRL) hudShiftState |= S_CTRL;
                if (nPrimary == K_SHIFT) hudShiftState |= S_SHIFT;
        }
-       else if (bInputType == 1)
+       else
        {
                if (nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT);
                if (nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL);
@@ -828,31 +834,33 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
                        first_digit = 0;
        }
 
-       if (bInputType != 0)
-               return false;
-
        int imp = 0;
        switch(nPrimary)
        {
                case K_RIGHTARROW:
+                       if (!key_pressed) return true;
                        mv_selection_keyboard = 1;
                        mv_selection = MapVote_MoveRight(mv_selection);
                        return true;
                case K_LEFTARROW:
+                       if (!key_pressed) return true;
                        mv_selection_keyboard = 1;
                        mv_selection = MapVote_MoveLeft(mv_selection);
                        return true;
                case K_DOWNARROW:
+                       if (!key_pressed) return true;
                        mv_selection_keyboard = 1;
                        mv_selection = MapVote_MoveDown(mv_selection);
                        return true;
                case K_UPARROW:
+                       if (!key_pressed) return true;
                        mv_selection_keyboard = 1;
                        mv_selection = MapVote_MoveUp(mv_selection);
                        return true;
                case K_KP_ENTER:
                case K_ENTER:
                case K_SPACE:
+                       if (!key_pressed) return true;
                        if ( mv_selection_keyboard )
                                MapVote_SendChoice(mv_selection);
                        return true;
@@ -872,6 +880,8 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
        {
                if (!first_digit)
                {
+                       if (!key_pressed)
+                               return true;
                        first_digit = imp % 10;
                        return true;
                }
@@ -881,6 +891,8 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 
        if (nPrimary == K_MOUSE1)
        {
+               if (!key_pressed)
+                       return true;
                mv_selection_keyboard = 0;
                mv_selection = mv_mouse_selection;
                if (mv_selection >= 0)
@@ -889,6 +901,8 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 
        if (imp)
        {
+               if (!key_pressed)
+                       return true;
                if (imp <= mv_num_maps)
                        localcmd(strcat("\nimpulse ", ftos(imp), "\n"));
                return true;