Merge branch 'master' into terencehill/scoreboard_ui

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

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 8bd5d78638c1fc607fd379d7d1b20d82d0b52ca9..bf34cce82f644cb251b2db76cb7350af88a016d7 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -455,6 +455,10 @@ float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary)
        TC(int, bInputType);
        bool override = false;
 
+       override |= HUD_Scoreboard_InputEvent(bInputType, nPrimary, nSecondary);
+       if (override)
+               return true;
+
        override |= HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary);
        if (override)
                return true;