Merge branch 'master' into terencehill/replicatevars_enhancements

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

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index d817b6be6c33cd6d11e6d84f5e1613eba77d73a5..7acbfe6cbafb20b4b0ee7ec41441e79828153dc7 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -4,6 +4,7 @@
 #include <client/draw.qh>
 #include <client/hud/_mod.qh>
 #include <client/hud/panel/centerprint.qh>
+#include <client/hud/panel/chat.qh>
 #include <client/hud/panel/quickmenu.qh>
 #include <client/hud/panel/scoreboard.qh>
 #include <client/items/items.qh>
@@ -452,10 +453,13 @@ float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {
        TC(int, bInputType);
        bool override = false;
+
        override |= HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary);
        if (override)
                return true;
 
+       override |= HUD_Panel_Chat_InputEvent(bInputType, nPrimary, nSecondary);
+
        override |= QuickMenu_InputEvent(bInputType, nPrimary, nSecondary);
 
        override |= HUD_Radar_InputEvent(bInputType, nPrimary, nSecondary);