X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=252c5032dee4f7687dd5af0d3bc04e6673274393;hb=cb8c9f9915bdaff154b2cf3d757c3b3bcbcbaa1c;hp=f53ea725c7d537403a7d785b7e21caf66cc82599;hpb=f64d037f9d2f38d874422e04d6147c1876a1c829;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index f53ea725c..252c5032d 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -234,18 +234,35 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 	if(MUTATOR_CALLHOOK(ForcePlayercolors_Skip, this, islocalplayer))
 		goto skipforcecolors;
 
+	bool forceplayercolors_enabled = false;
+	#define fpc autocvar_cl_forceplayercolors
+	if (ISGAMETYPE(DUEL))
+	{
+		if ((myteam != NUM_SPECTATOR) && (fpc == 1 || fpc == 2 || fpc == 3 || fpc == 5))
+			forceplayercolors_enabled = true;
+	}
+	else if (teamplay)
+	{
+		if ((team_count == 2) && (myteam != NUM_SPECTATOR) && (fpc == 2 || fpc == 4 || fpc == 5))
+			forceplayercolors_enabled = true;
+	}
+	else
+	{
+		if (fpc == 1 || fpc == 2)
+			forceplayercolors_enabled = true;
+	}
+
 	// forceplayercolors too
 	if(teamplay)
 	{
 		// own team's color is never forced
-		int forcecolor_friend = 0;
-		int forcecolor_enemy = 0;
+		int forcecolor_friend = 0, forcecolor_enemy = 0;
 		entity tm;
 
 		if(autocvar_cl_forcemyplayercolors)
 			forcecolor_friend = 1024 + autocvar_cl_forcemyplayercolors;
-		if((autocvar_cl_forceplayercolors == 2 && team_count == 2)
-			|| (autocvar_cl_forceplayercolors == 3 && IS_GAMETYPE(DUEL)))
+
+		if(forceplayercolors_enabled)
 			forcecolor_enemy = 1024 + autocvar__cl_color;
 
 		if(forcecolor_enemy && !forcecolor_friend)
@@ -280,11 +297,23 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 				this.colormap = forcecolor_enemy;
 		}
 	}
-	else
+	else // if(!teamplay)
 	{
 		if(autocvar_cl_forcemyplayercolors && islocalplayer)
 			this.colormap = 1024 + autocvar_cl_forcemyplayercolors;
-		else if(autocvar_cl_forceplayercolors)
+		else if (autocvar_cl_forceuniqueplayercolors && !islocalplayer && !ISGAMETYPE(DUEL))
+		{
+			// Assign each enemy unique colors
+			// pick colors from 0 to 14 since 15 is the rainbow color
+			// pl01 0 1, pl02 1 2, ..., pl14 13 14, pl15 14 0
+			// pl16 0 2, pl17 1 3, ..., pl29 13  0, pl30 14 1
+			int num = this.entnum - 1;
+			int c1 = num % 15;
+			int q = floor(num / 15);
+			int c2 = (c1 + 1 + q) % 15;
+			this.colormap = 1024 + (c1 << 4) + c2;
+		}
+		else if(forceplayercolors_enabled)
 			this.colormap = player_localnum + 1;
 	}
 
@@ -738,6 +767,7 @@ void CSQCModel_Hook_PostUpdate(entity this, bool isnew, bool isplayer, bool islo
 	bool is_playermodel = (substring(this.model, 0, 14) == "models/player/" || substring(this.model, 0, 17) == "models/ok_player/" || 
 							(substring(this.model, 0, 16) == "models/monsters/" && (this.isplayermodel & BIT(1))));
 	this.isplayermodel = BITSET(this.isplayermodel, ISPLAYER_MODEL, is_playermodel);
+	this.csqcmodel_isdead = false; // workaround for dead players who become a spectator
 
 	// save values set by server
 	if((this.isplayermodel & ISPLAYER_MODEL))