make sv_join_notices acctually work too

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 5fc08591397de3ecefd3a5208b5bafd140176a9e..0ba761f453cc05c3cdb091d447b58123861e302c 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -928,18 +928,6 @@ void PutClientInServer (void)
        } else if(self.classname == "observer" || (g_ca && !allowed_to_spawn)) {
                PutObserverInServer ();
        }
-    
-    // to-do: make sv_join_notices support per-entry times
-    if(!autocvar_sv_join_notices || autocvar_sv_join_notices == "")  
-        return;
-    
-    float argc = tokenizebyseparator(autocvar_sv_join_notices, "|");
-    if(argc > 0)
-    {
-        float i; 
-        for(i = argc - 1; i >= 0; --i)    
-            sv_notice_to(self, argv(i), autocvar_sv_join_notices_time, FALSE);
-    }
 
        //if(g_ctf)
        //      ctf_playerchanged();
@@ -1609,8 +1597,12 @@ void ClientConnect (void)
        CSQCMODEL_AUTOINIT();
 
        self.model_randomizer = random();
+    
+    if(clienttype(self) != CLIENTTYPE_REAL)
+        return;
+        
+    sv_notice_join();
 }
-
 /*
 =============
 ClientDisconnect