X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fstring.qh;h=72673b2354517e28c5abd96c1cc1eb8f160b5b70;hb=7c72d5214331a45148f67dd8ca3f66ce1767d7d2;hp=79ba56ebe9738c374b2bec10cf258ef070503a28;hpb=4f4c471a6ba861785a118487ac2ddadaead70d52;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/string.qh b/qcsrc/lib/string.qh
index 79ba56ebe..72673b235 100644
--- a/qcsrc/lib/string.qh
+++ b/qcsrc/lib/string.qh
@@ -4,6 +4,9 @@
 #include "sort.qh"
 #include "oo.qh"
 
+// this is not exactly 16KiB (16384 bytes) because one byte is reserved for the \0 terminator
+#define VM_TEMPSTRING_MAXSIZE 16383
+
 // string logic
 //
 // true: is truthy
@@ -139,23 +142,39 @@ string seconds_tostring(float seconds)
 
 /// \param[in] tm integer clocked time in tenths or hundredths, CANNOT be negative
 /// \param[in] hundredths if true append hundredths too, otherwise only tenths
+/// \param[in] compact if true leading 0s are omitted (except the seconds unit digit)
 /// \return clocked time as "m:ss.t" or "m:ss.th" string (rounded)
 ERASEABLE
-string clockedtime_tostring(int tm, bool hundredths)
+string clockedtime_tostring(int tm, bool hundredths, bool compact)
 {
 	if (tm < 0)
-		return strcat("0:00:0", hundredths ? "0" : "");
+	{
+		if (compact)
+			return strcat("0.0", hundredths ? "0" : "");
+		else
+			return strcat("0:00.0", hundredths ? "0" : "");
+	}
 	int acc = hundredths ? 6000 : 600;
-	int seconds = floor(tm + 0.5);
-	int minutes = floor(seconds / acc);
-	seconds -= minutes * acc;
+	tm = floor(tm + 0.5);
+	int minutes = floor(tm / acc);
+	int tm_without_minutes = tm - minutes * acc;
 	// NOTE: the start digit of s is a placeholder and won't be displayed
-	string s = ftos(acc * 10 + seconds);
-	return strcat(ftos(minutes), ":", substring(s, 1, 2), ".", substring(s, 3, hundredths ? 2 : 1));
+	string s = ftos(acc * 10 + tm_without_minutes);
+	if (!compact || minutes > 0)
+		return strcat(ftos(minutes), ":", substring(s, 1, 2), ".", substring(s, 3, hundredths ? 2 : 1));
+
+	int ofs = 2, digits = 1;
+	if (tm_without_minutes >= 10 * (hundredths ? 100 : 10))
+	{
+		ofs = 1;
+		digits = 2;
+	}
+	return strcat(substring(s, ofs, digits), ".", substring(s, 3, hundredths ? 2 : 1));
+
 }
 
-#define mmsst(tm) clockedtime_tostring(tm, false)
-#define mmssth(tm) clockedtime_tostring(tm, true)
+#define mmsst(tm, compact) clockedtime_tostring(tm, false, compact)
+#define mmssth(tm, compact) clockedtime_tostring(tm, true, compact)
 
 ERASEABLE
 string format_time(float seconds)
@@ -386,7 +405,6 @@ bool isInvisibleString(string s)
 			case 0xE0A0: // invisible char of the utf8 quake charmap
 			case 0xE020: // invisible char of the utf8 quake charmap
 			case 0x00A0: // NO-BREAK SPACE
-			//case 0x1680: // OGHAM SPACE MARK
 			case 0x180E: // MONGOLIAN VOWEL SEPARATOR
 			case 0x2000: // EN QUAD
 			case 0x2001: // EM QUAD
@@ -404,6 +422,8 @@ bool isInvisibleString(string s)
 			case 0x205F: // MEDIUM MATHEMATICAL SPACE
 			case 0x3000: // IDEOGRAPHIC SPACE
 			case 0xFEFF: // ZERO WIDTH NO-BREAK SPACE
+			case 0xFFA0: // Halfwidth Hangul Filler
+			case 0x3164: // Hangul Filler
 				if (utf8) break;
 			default:
 				return false;