From a65d65bee444a73c2553aac3667743b6d1619157 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Tue, 24 Oct 2006 22:57:19 +0000
Subject: [PATCH] fix for bug am46266: TFC team names not picking up

---
 amxmodx/amxmodx.cpp | 2 ++
 amxmodx/emsg.cpp    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/amxmodx/amxmodx.cpp b/amxmodx/amxmodx.cpp
index d5401606..1f050c3c 100755
--- a/amxmodx/amxmodx.cpp
+++ b/amxmodx/amxmodx.cpp
@@ -991,7 +991,9 @@ static cell AMX_NATIVE_CALL get_user_team(AMX *amx, cell *params) /* 3 param */
 		}
 		//
 		if (params[3])
+		{
 			set_amxstring(amx, params[2], pPlayer->team.c_str(), params[3]);
+		}
 
 		return pPlayer->teamId;
 	}
diff --git a/amxmodx/emsg.cpp b/amxmodx/emsg.cpp
index 7ede72af..62ded7c3 100755
--- a/amxmodx/emsg.cpp
+++ b/amxmodx/emsg.cpp
@@ -92,9 +92,10 @@ void Client_ShowMenu(void* mValue)
 	}
 }
 
+extern bool g_bmod_tfc;
 void Client_TeamInfo(void* mValue)
 {
-	if (mPlayer) return;
+	if (mPlayer && !g_bmod_tfc) return;
 	static int index;
 
 	switch (mState++)
@@ -107,6 +108,7 @@ void Client_TeamInfo(void* mValue)
 			char* msg = (char*)mValue;
 			g_players[index].team.assign(msg);
 			g_teamsIds.registerTeam(msg, -1);
+			break;
 	}
 }