From be6296b767c3627636e430b4f6c90fbec9d2bc33 Mon Sep 17 00:00:00 2001 From: Adrian Graber Date: Tue, 14 Feb 2023 16:02:20 +0100 Subject: [PATCH 1/2] Use per-player color on player stream in --- Server/Source/player.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Server/Source/player.cpp b/Server/Source/player.cpp index b93ca2c27..7a7b8ca4b 100644 --- a/Server/Source/player.cpp +++ b/Server/Source/player.cpp @@ -244,9 +244,16 @@ void Player::streamInForPlayer(IPlayer& other) { playerStreamInRPC.CustomSkin = models_data->getCustomSkin(); } + + Colour colour; + bool hasPlayerSpecificColour = other.getOtherColour(*this, colour); + if (!hasPlayerSpecificColour) + { + colour = colour_; + } playerStreamInRPC.Team = team_; - playerStreamInRPC.Col = colour_; + playerStreamInRPC.Col = colour; playerStreamInRPC.Pos = pos_; playerStreamInRPC.Angle = rot_.ToEuler().z; playerStreamInRPC.FightingStyle = fightingStyle_; From ec5fed471dca7c4b4bdfc014a34f74974d4ea68b Mon Sep 17 00:00:00 2001 From: Adrian Graber Date: Tue, 14 Feb 2023 16:07:18 +0100 Subject: [PATCH 2/2] Make clang-format happy stray whitespace make clang go boohoo --- Server/Source/player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/Source/player.cpp b/Server/Source/player.cpp index 7a7b8ca4b..8537caddd 100644 --- a/Server/Source/player.cpp +++ b/Server/Source/player.cpp @@ -244,7 +244,7 @@ void Player::streamInForPlayer(IPlayer& other) { playerStreamInRPC.CustomSkin = models_data->getCustomSkin(); } - + Colour colour; bool hasPlayerSpecificColour = other.getOtherColour(*this, colour); if (!hasPlayerSpecificColour)