From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 23 Sep 2013 10:11:44 +0000 (+0200)
Subject: Get rid of welcome_message_time cvar. Only annoying to track down.
X-Git-Tag: xonotic-v0.8.0~324
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8e6a61d0dd23c6cbd3dc98fb08b4d0f0c6c9477a;p=xonotic%2Fxonotic-data.pk3dir.git

Get rid of welcome_message_time cvar. Only annoying to track down.

This made the MOTD useless. Users can always use the i key to hide the
MOTD, so this shouldn't be a big issue.
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 28c1af69d..6cd876b4b 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -428,8 +428,6 @@ bind f7 menu_showsandboxtools
 set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps"
 set g_botclip_collisions 1 "0 = disable collision testing against botclips, might be useful on some defrag maps"
 
-set welcome_message_time 8
-
 set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up"
 
 set g_spawn_alloweffects 1 "allow clients to enable spawn point and event effects such as particles and sounds, see cl_spawn_ cvars for more info"
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 711d91436..759aea6ad 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1204,7 +1204,6 @@ float autocvar_timelimit_overtimes;
 float autocvar_timelimit_suddendeath;
 #define autocvar_utf8_enable cvar("utf8_enable")
 float autocvar_waypoint_benchmark;
-float autocvar_welcome_message_time;
 float autocvar_sv_gameplayfix_gravityunaffectedbyticrate;
 float autocvar_g_trueaim_minrange;
 float autocvar_g_debug_defaultsounds;
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 897e75663..fac4314ca 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2045,7 +2045,7 @@ void PrintWelcomeMessage()
 	{
 		if(self.BUTTON_INFO) // BUTTON_INFO hides initial MOTD
 			self.motd_actived_time = -2; // wait until BUTTON_INFO gets released
-		else if(self.motd_actived_time == -2 || IS_PLAYER(self) || time - self.jointime > autocvar_welcome_message_time)
+		else if(self.motd_actived_time == -2 || IS_PLAYER(self))
 		{
 			// instanctly hide MOTD
 			self.motd_actived_time = 0;
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index d654b91d5..8557e38c4 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -323,7 +323,6 @@ void cvar_changes_init()
 		BADCVAR("sv_fraginfo");
 		BADCVAR("sv_timeout");
 		BADPREFIX("sv_timeout_");
-		BADCVAR("welcome_message_time");
 		BADPREFIX("crypto_");
 		BADPREFIX("g_chat_");
 		BADPREFIX("g_ctf_captimerecord_");