Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

[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 7aa2f1c8ff4d0a1e6669d7ba2ce83ddb1ef43a50..b2484e0540d863c840fdb446f7ca51f71bb3bc5a 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1401,9 +1401,6 @@ void ClientConnect (void)
 
        race_PreSpawnObserver();
 
-       //if(g_domination)
-       //      dom_player_join_team(self);
-
        // identify the right forced team
        if(autocvar_g_campaign)
        {
@@ -1589,9 +1586,6 @@ void ClientConnect (void)
        else if(autocvar_sv_teamnagger && !(autocvar_bot_vs_human && (c3==-1 && c4==-1)) && !g_ca) // teamnagger is currently bad for ca
                send_CSQC_teamnagger();
 
-       if (g_domination)
-               set_dom_state(self);
-
        CheatInitClient();
 
        if(!autocvar_g_campaign)