From a9613347c6a27b6d184eb79f2385458b3078dbee Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Fri, 9 Sep 2022 02:40:18 +0200
Subject: [PATCH] Squirrel: fix color logging bug

Fix defect where color logging for script error/warnings did not work for the in-game console, when color logging for external console was disabled.

This is the only reported SDK defect after 15K downloads!
---
 r5dev/squirrel/sqvm.cpp | 45 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/r5dev/squirrel/sqvm.cpp b/r5dev/squirrel/sqvm.cpp
index be80014f..53ed5381 100644
--- a/r5dev/squirrel/sqvm.cpp
+++ b/r5dev/squirrel/sqvm.cpp
@@ -108,8 +108,26 @@ SQRESULT SQVM_PrintFunc(HSQUIRRELVM v, SQChar* fmt, ...)
 
 	if (sq_showvmoutput->GetInt() > 1 || bLogLevelOverride)
 	{
-		bool bError = false;
 		bool bColorOverride = false;
+		bool bError = false;
+
+		if (g_bSQAuxError)
+		{
+			bColorOverride = true;
+			if (strstr(buf, "SCRIPT ERROR:") || strstr(buf, " -> ")) {
+				bError = true;
+			}
+		}
+		else if (g_bSQAuxBadLogic)
+		{
+			if (strstr(buf, "There was a problem processing game logic."))
+			{
+				bColorOverride = true;
+				bError = true;
+				g_bSQAuxBadLogic = false;
+			}
+		}
+
 		if (!g_bSpdLog_UseAnsiClr)
 		{
 			wconsole->debug(vmStr);
@@ -117,15 +135,13 @@ SQRESULT SQVM_PrintFunc(HSQUIRRELVM v, SQChar* fmt, ...)
 			RCONServer()->Send(vmStr, "", sv_rcon::response_t::SERVERDATA_RESPONSE_CONSOLE_LOG, nResponseId);
 #endif // DEDICATED
 		}
-		else
+		else // Use ANSI escape codes for the external console.
 		{
 			static std::string vmStrAnsi;
-			if (g_bSQAuxError)
+			if (bColorOverride)
 			{
-				bColorOverride = true;
-				if (strstr(buf, "SCRIPT ERROR:") || strstr(buf, " -> "))
+				if (bError)
 				{
-					bError = true;
 					vmStrAnsi = Plat_GetProcessUpTime();
 					vmStrAnsi.append(SQVM_ERROR_ANSI_LOG_T[static_cast<SQInteger>(context)]);
 				}
@@ -135,23 +151,6 @@ SQRESULT SQVM_PrintFunc(HSQUIRRELVM v, SQChar* fmt, ...)
 					vmStrAnsi.append(SQVM_WARNING_ANSI_LOG_T[static_cast<SQInteger>(context)]);
 				}
 			}
-			else if (g_bSQAuxBadLogic)
-			{
-				if (strstr(buf, "There was a problem processing game logic."))
-				{
-					bError = true;
-					bColorOverride = true;
-					g_bSQAuxBadLogic = false;
-
-					vmStrAnsi = Plat_GetProcessUpTime();
-					vmStrAnsi.append(SQVM_ERROR_ANSI_LOG_T[static_cast<SQInteger>(context)]);
-				}
-				else
-				{
-					vmStrAnsi = Plat_GetProcessUpTime();
-					vmStrAnsi.append(SQVM_ANSI_LOG_T[static_cast<SQInteger>(context)]);
-				}
-			}
 			else
 			{
 				vmStrAnsi = Plat_GetProcessUpTime();