]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 9 Jun 2010 23:41:33 +0000 (02:41 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 9 Jun 2010 23:41:33 +0000 (02:41 +0300)
1  2 
qcsrc/client/hud.qc

index 0b0bae8029f3e0699c673ef9de23a33904ca450a,1cbed12940df793a0bc56f3626c34931872b9010..7d87df8f7d347649848ac8db2f76e6396d424cc8
@@@ -1192,11 -1179,10 +1192,13 @@@ float HUD_Panel_InputEvent(float bInput
                }
        }
        else if(nPrimary == K_ESCAPE)
-               cvar_set("_hud_configure", "0");
+       {
+               localcmd("menu_showhudexit\n");
+       }
  
 +      else if(hit_con_bind)
 +              return false;
 +
        return true; // Suppress ALL other input
  }