Merge branch 'master' into terencehill/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / util.qh

diff --git a/qcsrc/menu/xonotic/util.qh b/qcsrc/menu/xonotic/util.qh
index 2cdfe87c7924b167dc92899b7beb41901a11a2ea..e5fcc155a3e2c7350217d2faed2400717d063dd9 100644 (file)
--- a/qcsrc/menu/xonotic/util.qh
+++ b/qcsrc/menu/xonotic/util.qh
@@ -22,8 +22,6 @@ string getZonedTooltipForIdentifier(string s);
 
 string resolvemod(string m);
 
-string HUD_Panel_GetSettingName(float setting);
-
 float URI_GET_DISCARD = 0;
 
 float URI_GET_UPDATENOTIFICATION = 1;
@@ -46,7 +44,9 @@ void dialog_hudpanel_common_notoggle(entity me, string panelname);
        dialog_hudpanel_common_notoggle(me, panelname)
 #define DIALOG_HUDPANEL_COMMON() \
        me.TR(me); \
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, strzone(strcat("hud_panel_", panelname)), _("Enable panel"))); \
+               me.TD(me, 1, 4, e = makeXonoticCheckBox(0, strzone(strcat("hud_panel_", panelname)), _("Enable panel"))); \
        DIALOG_HUDPANEL_COMMON_NOTOGGLE()
 
 string language_filename(string s);
+string CTX(string s);
+#define ZCTX(s) strzone(CTX(s))