Merge remote branch 'origin/master' into terencehill/infinite_ammo

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

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index a897bdd33d299b20f84e83f1e5dc9566e58b05f5..109a9cf54a239b17e7280f2aa15823c06c3614f6 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -126,6 +126,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        HUD_Write_PanelCvar_q("_flip");
                                        HUD_Write_PanelCvar_q("_fontscale");
                                        HUD_Write_PanelCvar_q("_time");
+                                       HUD_Write_PanelCvar_q("_fadetime");
                                        break;
                        }
                        HUD_Write("\n");
@@ -571,6 +572,10 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
        string s;
 
+       // we only care for keyboard events
+       if(bInputType != 0 && bInputType != 1)
+               return false;
+
        if(!autocvar__hud_configure)
                return false;