From 5d892c49f2050ffbf7a9de76d7c5ad25f290054d Mon Sep 17 00:00:00 2001 From: ac_stef Date: Sat, 22 Nov 2008 18:25:54 +0000 Subject: [PATCH] tktf message fix git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3731 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 5f828f3d..82e63a1b 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -766,7 +766,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 ") : ""; + const char *flagteam = m_ktf ? (teammate ? "your teammate " : "your enemy ") : ""; switch(message) { @@ -1079,7 +1079,7 @@ playerent *updatefollowplayer(int shiftdirection) } // set new spect mode -void spectate(int mode) +void spectate(int mode) { if(!player1->isspectating()) return; if(mode == player1->spectatemode) return;