Set the player's team to 0 in non-teamplay gamemodes

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index dfd9c35f51790266975367003e6741f9f1168b53..0ad653c6f86aa142d85d2951493736e95d0da43c 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -299,10 +299,10 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
                }
 
                int proj_team = ReadByte();
-               this.team = proj_team - 1;
 
                if(teamplay)
                {
+                       this.team = proj_team - 1;
                        if(proj_team)
                                this.colormap = (this.team) * 0x11; // note: team - 1 on server (client uses different numbers)
                        else
@@ -310,7 +310,10 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
                        this.colormap |= BIT(10); // RENDER_COLORMAPPED
                }
                else
+               {
+                       this.team = 0;
                        this.colormap = proj_team;
+               }
                // TODO: projectiles use glowmaps for their color, not teams
                #if 0
                if(this.colormap > 0)

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index f9da5a2d43ea75b986f5ce00a6083b61a6389a21..c442a78d6bdaea0bf7e85eb8d9d33f7ce196ed9e 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -162,7 +162,10 @@ void setcolor(entity this, int clr)
 {
 #if 1
        this.clientcolors = clr;
-       this.team = (clr & 15) + 1;
+       if(teamplay)
+               this.team = (clr & 15) + 1;
+       else
+               this.team = 0;
 #else
        builtin_setcolor(this, clr);
 #endif