Fix #2701 "Unwanted random auto-join". This patch basically reverts 4941322

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / mapvoting.qc

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 40d8e0d0727cba6d900ad907010e2116c269e412..29640128c0abf575c8a8b43fa03cb81c5d044e9e 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -339,7 +339,6 @@ float MapVote_Selection(vector topleft, vector cellsize, float rows, float colum
        return mv_mouse_selection;
 }
 
-vector prev_mousepos;
 // draws map vote or gametype vote
 void MapVote_Draw()
 {
@@ -357,15 +356,6 @@ void MapVote_Draw()
 
        HUD_Panel_LoadCvars();
 
-       if (!autocvar_hud_cursormode)
-       {
-               if (mousepos.x != prev_mousepos.x || mousepos.y != prev_mousepos.y)
-               {
-                       mv_selection_keyboard = 0;
-                       prev_mousepos = mousepos;
-               }
-       }
-
        center = (vid_conwidth - 1)/2;
        xmin = vid_conwidth * 0.08;
        xmax = vid_conwidth - xmin;
@@ -819,13 +809,22 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
                return true;
        }
 
-       if (bInputType == 0)
+       if (bInputType == 2)
+       {
+               mv_selection_keyboard = 0;
+               return false;
+       }
+
+       // at this point bInputType can only 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);
@@ -835,8 +834,11 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
                        first_digit = 0;
        }
 
-       if (bInputType != 0)
-               return false;
+       // Key release events must be handled by the engine otherwise the on-press command such as +jump
+       // executed by pressing SPACE before entering the map voting screen won't be followed by the
+       // on-release command (-jump) on key release once entered the map voting screen, causing +jump
+       // to stay active even on the next map and automatically forcing the player to join
+       if (!key_pressed) return false;
 
        int imp = 0;
        switch(nPrimary)
@@ -894,6 +896,9 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
                        imp = min(mv_selection + 1, mv_num_maps);
        }
 
+       if (nPrimary == K_MOUSE2)
+               return true; // do nothing
+
        if (imp)
        {
                if (imp <= mv_num_maps)