From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 2 Nov 2010 16:59:23 +0000 (+0100)
Subject: make g_start_delay not saved to not interfere with dedicated server
X-Git-Tag: xonotic-v0.1.0preview~211
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b3c925adbd60c383dc76515ffbeb1deb8834862c;p=xonotic%2Fxonotic-data.pk3dir.git

make g_start_delay not saved to not interfere with dedicated server
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index c570d0d19..9513dfcc4 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -26,11 +26,13 @@ gameversion_max 65535 // git builds see all versions
 alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
 
 // detect dedicated server or client
-alias "_detect_dedicated_$qport" "$*"
+alias "_detect_dedicated_$qport" "${* asis}"
 alias "_detect_dedicated_0" ""
-alias if_dedicated "_detect_dedicated_$qport ${* asis}"
+alias _if_dedicated "_detect_dedicated_$qport ${* asis}"
 alias if_client "${* asis}"
-if_dedicated alias if_client ""
+alias if_dedicated "${* asis}"
+_if_dedicated alias if_client ""
+if_client alias if_dedicated ""
 
 seta g_configversion 0	"Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
@@ -1592,8 +1594,8 @@ seta sv_status_privacy 1	"hide IP addresses from \"status\" replies shown to cli
 set g_maplist_allow_hidden 0		"allow hidden maps to be, e.g., voted for and in the maplist"
 set g_maplist_allow_frustrating 0	"allow impossible maps to be, e.g., voted for and in the maplist (if set to 2, ONLY impossible maps are allowed)"
 
-seta g_start_delay 0	"delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server"
-	if_dedicated set g_start_delay 15
+if_client set g_start_delay 0	"delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server"
+if_dedicated set g_start_delay 15	"delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server"
 
 alias ons_map           "cl_cmd radar" // legacy alias
 alias radar             "cl_cmd radar"
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c
index 2d75d4365..a49e3529c 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c
@@ -6,7 +6,7 @@ CLASS(XonoticAdvancedDialog) EXTENDS(XonoticDialog)
 	ATTRIB(XonoticAdvancedDialog, title, string, "Advanced server settings")
 	ATTRIB(XonoticAdvancedDialog, color, vector, SKINCOLOR_DIALOG_ADVANCED)
 	ATTRIB(XonoticAdvancedDialog, intendedWidth, float, 0.5)
-	ATTRIB(XonoticAdvancedDialog, rows, float, 14)
+	ATTRIB(XonoticAdvancedDialog, rows, float, 13)
 	ATTRIB(XonoticAdvancedDialog, columns, float, 3)
 	ATTRIB(XonoticAdvancedDialog, refilterEntity, entity, NULL)
 ENDCLASS(XonoticAdvancedDialog)
@@ -30,10 +30,6 @@ void XonoticAdvancedDialog_fill(entity me)
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Spawn shield:"));
 		me.TD(me, 1, 1.7, e = makeXonoticSlider(0, 15, 0.5, "g_spawnshieldtime"));
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Start delay:"));
-		me.TD(me, 1, 1.7, e = makeXonoticSlider(0, 30, 0.5, "g_start_delay"));
 	me.TR(me);
 	me.TR(me);
 		me.TDempty(me, 0.2);