new color semantics for sdl_ttf in #199

project-imprimis · Oct 16, 2022 · 2375a5e · 2375a5e
1 parent 2f0474f
commit 2375a5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/engine/interface/command.cpp b/src/engine/interface/command.cpp
@@ -1554,7 +1554,8 @@ int unescapestring(char *dst, const char *src, const char *end)
                 }
                 case 'f':
                 {
-                    *dst++ = '\f';
+                    *dst++ = '^';
+                    *dst++ = 'f';
                     break;
                 }
                 default:

diff --git a/src/engine/interface/cubestd.cpp b/src/engine/interface/cubestd.cpp
@@ -1346,7 +1346,7 @@ char *strreplace(const char *s, const char *oldval, const char *newval, const ch
 //external api function, for loading the string manip functions into the global hashtable
 void initstrcmds()
 {
-    addcommand("echo", reinterpret_cast<identfun>(+[] (char *s) { conoutf("\f1%s", s); }), "C", Id_Command);
+    addcommand("echo", reinterpret_cast<identfun>(+[] (char *s) { conoutf("^f1%s", s); }), "C", Id_Command);
     addcommand("error", reinterpret_cast<identfun>(+[] (char *s) { conoutf(Console_Error, "%s", s); }), "C", Id_Command);
     addcommand("strstr", reinterpret_cast<identfun>(+[] (char *a, char *b) { { char *s = std::strstr(a, b); intret(s ? s-a : -1); }; }), "ss", Id_Command);
     addcommand("strlen", reinterpret_cast<identfun>(+[] (char *s) { intret(std::strlen(s)); }), "s", Id_Command);