From: Mario <mario@smbclan.net>
Date: Fri, 15 Jun 2018 16:04:27 +0000 (+1000)
Subject: Use team colour for the same team flag carrier instead of yellow
X-Git-Tag: xonotic-v0.8.5~2045
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97aafd9af32399d15d1836b51300d1cc0b740cc5;p=xonotic%2Fxonotic-data.pk3dir.git

Use team colour for the same team flag carrier instead of yellow
---

diff --git a/qcsrc/common/gamemodes/gamemode/ctf/ctf.qh b/qcsrc/common/gamemodes/gamemode/ctf/ctf.qh
index 74a3993e3..2f9643b4a 100644
--- a/qcsrc/common/gamemodes/gamemode/ctf/ctf.qh
+++ b/qcsrc/common/gamemodes/gamemode/ctf/ctf.qh
@@ -51,7 +51,8 @@ const float VEHICLE_FLAG_SCALE = 1.0;
 
 // waypoint colors
 #define WPCOLOR_ENEMYFC(t) ((t) ? colormapPaletteColor(t - 1, false) * 0.75 : '1 1 1')
-#define WPCOLOR_FLAGCARRIER(t) (WP_FlagCarrier.m_color)
+#define WPCOLOR_FLAGCARRIER(t) ((t) ? colormapPaletteColor(t - 1, false) * 0.75 : '1 1 1')
+//#define WPCOLOR_FLAGCARRIER(t) (WP_FlagCarrier.m_color)
 #define WPCOLOR_DROPPEDFLAG(t) ((t) ? ('0.25 0.25 0.25' + colormapPaletteColor(t - 1, false)) * 0.5 : '1 1 1')
 
 // sounds