From: terencehill <piuntn@gmail.com>
Date: Thu, 2 Sep 2010 22:31:02 +0000 (+0200)
Subject: Use menu_sync in hud configs instead of menu_restart, it's A LOT faster and can be... 
X-Git-Tag: xonotic-v0.1.0preview~315^2~2^2
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=e8f3747d942042ce585d9c94d1d67d18abec2684;p=xonotic%2Fxonotic-data.pk3dir.git

Use menu_sync in hud configs instead of menu_restart, it's A LOT faster and can be added in hud_default.cfg too
Note: at startup menu_sync doesn't really get executed, since before executing hud_default.cfg it's defined as ""
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 691e2d853..07e3b49d9 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1338,7 +1338,7 @@ seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info pr
 
 // hud cvar descriptions
 exec _hud_descriptions.cfg
-// exec the default skin config. remember, NO menu_restart in the deafault cfg (dp segfaults at startup otherwise)
+// exec the default skin config
 // please add any new cvars into the hud_save script in qcsrc/client/hud.qc for consistency
 exec hud_default.cfg
 
diff --git a/hud_default.cfg b/hud_default.cfg
index 1a85affd0..813947b7e 100644
--- a/hud_default.cfg
+++ b/hud_default.cfg
@@ -201,3 +201,5 @@ seta hud_panel_infomessages_bg_alpha ""
 seta hud_panel_infomessages_bg_border ""
 seta hud_panel_infomessages_bg_padding "0"
 seta hud_panel_infomessages_flip "1"
+
+menu_sync
diff --git a/hud_luminos_default.cfg b/hud_luminos_default.cfg
index 65331cf9d..813947b7e 100644
--- a/hud_luminos_default.cfg
+++ b/hud_luminos_default.cfg
@@ -202,4 +202,4 @@ seta hud_panel_infomessages_bg_border ""
 seta hud_panel_infomessages_bg_padding "0"
 seta hud_panel_infomessages_flip "1"
 
-menu_restart
+menu_sync
diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg
index 8b695514e..93e8c9959 100644
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -202,4 +202,4 @@ seta hud_panel_infomessages_bg_border ""
 seta hud_panel_infomessages_bg_padding ""
 seta hud_panel_infomessages_flip "1"
 
-menu_restart
+menu_sync
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 3d1a54037..91dc1658b 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -517,7 +517,7 @@ void HUD_Panel_ExportCfg(string cfgname)
 			}
 			fputs(fh, "\n");
 		}
-		fputs(fh, strcat("menu_restart", "\n")); // force a menu update when execing config, so that the dialogs are updated
+		fputs(fh, strcat("menu_sync", "\n")); // force the menu to reread the cvars, so that the dialogs are updated
 
 		print("^2Successfully exported to hud_", autocvar_hud_skin, "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n");
 	}