From 2b3846418d4a46137980ec569f6f540b261c04c6 Mon Sep 17 00:00:00 2001 From: ac_stef Date: Sat, 15 Nov 2008 15:58:30 +0000 Subject: [PATCH] display the flag grabbers' team in tktf git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3505 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 1bd8adfe..7e2d48d6 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -773,6 +773,7 @@ void flagmsg(int flag, int message, int actor, int flagtime) bool firstperson = actor == getclientnum(); bool teammate = !act ? true : isteam(player1->team, act->team); const char *teamstr = m_ktf ? "the" : own ? "your" : "the enemy"; + const char *flagteam = m_ktf ? (own && m_teammode ? "your teammate " : "your enemy ") : ""; switch(message) { @@ -783,7 +784,7 @@ void flagmsg(int flag, int message, int actor, int flagtime) hudoutf("\f2you got the %sflag", m_ctf ? "enemy " : ""); musicsuggest(M_FLAGGRAB, m_ctf ? 90*1000 : 900*1000, true); } - else hudoutf("\f2%s got %s flag", colorname(act), teamstr); + else hudoutf("\f2%s%s got %s flag", flagteam, colorname(act), teamstr); break; case FM_LOST: case FM_DROP: