From 371a808d9ecec7e4dccdb1c6bab7c33a53c8da3f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 27 Jul 2020 18:12:24 +0200
Subject: [PATCH] - set MP taunt texts as CVAR defaults to ensure they won't
 get deleted by user actions.

---
 source/core/gamecontrol.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
index 813a64f55..2650b9bf7 100644
--- a/source/core/gamecontrol.cpp
+++ b/source/core/gamecontrol.cpp
@@ -907,8 +907,9 @@ void CONFIG_ReadCombatMacros()
 		for (auto s : CombatMacros)
 		{
 			sc.MustGetToken(TK_StringConst);
-			if (strlen(*s) == 0)
-				*s = sc.String;
+			UCVarValue val;
+			val.String = sc.String;
+			s->SetGenericRepDefault(val, CVAR_String);
 		}
 	}
 	catch (const CRecoverableError &)