Merge branch 'master' into terencehill/newpanelhud-dom_points

[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 df6c8d4b2a3f41e0793e271d8aae9a9b54512692..6cc10bcd6bb767d1307cb38a52d896f49e76d03e 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1397,6 +1397,7 @@ Called when a client connects to the server
 string ColoredTeamName(float t);
 void DecodeLevelParms (void);
 //void dom_player_join_team(entity pl);
+void set_dom_state(entity e, float connecting);
 void ClientConnect (void)
 {
        float t;
@@ -1597,6 +1598,8 @@ void ClientConnect (void)
        else if(cvar("sv_teamnagger") && !(cvar("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, TRUE);
        send_CSQC_cr_maxbullets(self);
 
        CheatInitClient();