From e24168d70bc6f1605904963f0c6ff4abc3c42d51 Mon Sep 17 00:00:00 2001
From: Artem Golubikhin <WPMGPRoSToTeMa@users.noreply.github.com>
Date: Sat, 15 Jul 2017 17:32:07 +0000
Subject: [PATCH] Added support for formatters containing #

---
 Main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Main.cpp b/Main.cpp
index 11d35ff..503ca88 100644
--- a/Main.cpp
+++ b/Main.cpp
@@ -981,7 +981,7 @@ void PF_MessageEnd_I() {
 			curPos += args[args.size() - 1].length() + 1;
 		}
 
-		if (msgName == "SayText" && format[0] != '#') {
+		if (msgName == "SayText" && format[0] != '#' && !(args.size() != 0 && format.find('#') != string::npos)) {
 			if (args.size() == 0) {
 				g_msgBuffer->cursize = 0;
 				g_msgBuffer->data[g_msgBuffer->cursize++] = arg;
@@ -1002,7 +1002,7 @@ void PF_MessageEnd_I() {
 				strcpy((char*)&g_msgBuffer->data[g_msgBuffer->cursize], formatted.c_str());
 				g_msgBuffer->cursize += formatted.length() + 1;
 			}
-		} else if (msgName == "TextMsg" && format[0] != '#' && arg == HUD_PRINTTALK) {
+		} else if (msgName == "TextMsg" && format[0] != '#' && arg == HUD_PRINTTALK && !(args.size() != 0 && format.find('#') != string::npos)) {
 			if (args.size() == 0) {
 				g_msgBuffer->cursize = 0;
 				g_msgBuffer->data[g_msgBuffer->cursize++] = arg;