]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix another message: "player X connecting..." wasn't shown in DM games
authorterencehill <piuntn@gmail.com>
Wed, 23 Dec 2015 12:51:57 +0000 (13:51 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 23 Dec 2015 12:51:57 +0000 (13:51 +0100)
qcsrc/server/teamplay.qc

index 80b0817ca2889a578a9f3f3dde114c875082dea4..60116bada2686921e8a3938849e0dffb013cebdf 100644 (file)
@@ -583,10 +583,8 @@ void SV_ChangeTeam(float _color)
        float scolor, dcolor, steam, dteam; //, dbotcount, scount, dcount;
 
        // in normal deathmatch we can just apply the color and we're done
-       if(!teamplay) {
+       if(!teamplay)
                SetPlayerColors(self, _color);
-               return;
-       }
 
        if(!IS_CLIENT(self))
        {
@@ -595,6 +593,9 @@ void SV_ChangeTeam(float _color)
                return;
        }
 
+       if(!teamplay)
+               return;
+
        scolor = self.clientcolors & 0x0F;
        dcolor = _color & 0x0F;