Misc fixes

Author: DosMike

Modules.md

@@ -17,4 +17,6 @@ Replacement for Cider ChatProcessors AllChat and DeadChat with some bonus featur
 
 `sm_sayredirect_snoopflag` - Add staff members with the specified admin bit as recipients to MCP chat messages (Default z, empty to disable)
 
-`sm_sayredirect_colorteamtag` - Set the (TEAM)-say prefix to use team color (1/0)
+`sm_sayredirect_colorteamtag` - Set the (TEAM)-say prefix to use team color (1/0)
+
+`sm_sayredirect_forceteamname` - Force say_team messages to use the team name instead of the generic (TEAM) prefix (1/0)

README.md

@@ -42,7 +42,7 @@ Lastly there's the option `Ban On NewLine`, this option will automatically perma
 There is no way (that I know of) for a player to input new line characters into a chat message, and this seems to be only used by hack clients to disrupt chat flow (With the latest TF2 patch this should not longer be possible in that game anyways).
 
 The config can be found at `addons/sourcemod/config/metachatprocessor.cfg`:
-```json
+```c
 "config"
 {
 	"Compatibility"

scripting/MetaChatProcessor.sp

@@ -307,7 +307,12 @@ public Action OnCommand_SayCommand(int client, const char[] command, int argc) {
 	BuildMessageFormat(g_currentMessage.senderflags, g_currentMessage.group, g_currentMessage.msg_name, sizeof(MessageData::msg_name));
 	// fetch name and message
 	GetClientName(client, g_currentMessage.sender_name, sizeof(MessageData::sender_name));
-	GetCmdArgString(g_currentMessage.message, 128); //this uses the max length of the chat box, no cheating with console
+	GetCmdArgString(g_currentMessage.message, sizeof(MessageData::message));
+	if (argc==1 && g_currentMessage.message[0]=='"') {
+		//higly probable that this message is sent from chat. argc==1 makes this check more robust than base game xD
+		StripQuotes(g_currentMessage.message);
+	}
+	g_currentMessage.message[128]=0; //this uses the max length of the chat box, no cheating
 
 	// replace all control characters with a question mark. not possible through steam, but hacker can do
 	int len = strlen(g_currentMessage.sender_name);

scripting/MetaChatProcessor/utilities.sp

@@ -78,6 +78,7 @@ void LoadCompatConfig() {
 		if (kv.GetNum("Trim All Whitespaces")>0) g_sanitizeInput |= mcpInputTrimMBSpace;
 		if (kv.GetNum("Ban On NewLine")>0) g_sanitizeInput |= mcpInputBanNewline;
 		if (kv.GetNum("Strip Native Colorcodes")>0) g_sanitizeInput |= mcpInputStripColors;
+		kv.GoBack();
 	} else LogError("[MCP] 'Input Sanitizer' section missing from config");
 	//transport method
 	if (kv.GetDataType("Transport")==KvData_String) {

scripting/mcp-sayredirects.sp

@@ -21,6 +21,7 @@ bool g_SnoopingEnabled;
 int g_AllChatMode;
 bool g_DeadChat;
 bool g_TeamTagColor;
+bool g_ForceTeamName;
 
 static void HookAndLoadConVar(ConVar convar, ConVarChanged hook) {
 	//I sometimes hate convars...
@@ -41,15 +42,18 @@ public void OnPluginStart() {
 	ConVar cvar2 = CreateConVar("sm_sayredirect_allchat", "0", "Redirect team chat as follows: 0-Don't change; 1-Always to all; 2-Team 2 chat to all; 3-Team 3 chat to all", _, true, 0.0, true, 3.0);
 	ConVar cvar3 = CreateConVar("sm_sayredirect_deadchat", "0", "Send messages from dead players to alive players", _, true, 0.0, true, 1.0);
 	ConVar cvar4 = CreateConVar("sm_sayredirect_colorteamtag", "0", "Color the (TEAM) tag for say_team in team color", _, true, 0.0, true, 1.0);
+	ConVar cvar5 = CreateConVar("sm_sayredirect_forceteamname", "0", "Force team say to use the team name instead of (TEAM)", _, true, 0.0, true, 1.0);
 	AutoExecConfig(); //gen/load config
 	HookAndLoadConVar(cvar1,OnConVarChanged_SnoopFlag);
 	HookAndLoadConVar(cvar2,OnConVarChanged_AllChat);
 	HookAndLoadConVar(cvar3,OnConVarChanged_DeadChat);
 	HookAndLoadConVar(cvar4,OnConVarChanged_TeamTagColor);
+	HookAndLoadConVar(cvar5,OnConVarChanged_ForceTeamName);
 	delete cvar1;
 	delete cvar2;
 	delete cvar3;
 	delete cvar4;
+	delete cvar5;
 }
 
 public void OnAllPluginsLoaded() {
@@ -69,12 +73,20 @@ public void OnConVarChanged_DeadChat(ConVar convar, const char[] oldValue, const
 public void OnConVarChanged_TeamTagColor(ConVar convar, const char[] oldValue, const char[] newValue) {
 	g_TeamTagColor = convar.BoolValue;
 }
+public void OnConVarChanged_ForceTeamName(ConVar convar, const char[] oldValue, const char[] newValue) {
+	g_ForceTeamName = convar.BoolValue;
+}
 
 public Action OnMessage_Redirect(int& sender, ArrayList recipients, mcpSenderFlag& senderflags, mcpTargetGroup& targetgroup, mcpMessageOption& options, char[] targetgroupColor) {
 	bool isTeamSay = mcpTargetTeam1 <= targetgroup <= mcpTargetTeamSender;
 	bool isDeadChat = (senderflags & mcpSenderDead)!=mcpSenderNone;
 	int fromTeam = sender ? GetClientTeam(sender) : 0;
 
+	//use team names instead of generic (TEAM) tag for say_team
+	if (targetgroup == mcpTargetTeamSender && g_ForceTeamName && fromTeam) {
+		targetgroup = view_as<mcpTargetGroup>(fromTeam);
+	}
+	
 	//true if this message stays withing the senders team
 	bool checkTeam = isTeamSay;
 	if (isTeamSay && (g_AllChatMode==1||(g_AllChatMode>1 && g_AllChatMode==fromTeam))) {