X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fstring.qh;h=3c39b7c0bb8e93a0f94ec95cbd081a41e44ba3e2;hb=HEAD;hp=c99497bc7566c6cd1d6bdf381dc3e1175387b815;hpb=4e21f418ad9e6287efb942c1fa2861a51981110a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/string.qh b/qcsrc/lib/string.qh
index c99497bc7..743f4310b 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
@@ -117,14 +120,62 @@ string strftime_s()
 	return strcat(ftos(hundreds_of_seconds), seconds_str);
 }
 
+/// \param[in] seconds number of seconds, can be negative too
+/// \return time as "m:ss" string (floored)
 ERASEABLE
-string seconds_tostring(float sec)
+string seconds_tostring(float seconds)
 {
-	float minutes = floor(sec / 60);
-	sec -= minutes * 60;
-	return sprintf("%d:%02d", minutes, sec);
+	bool negative = false;
+	if (seconds < 0)
+	{
+		negative = true;
+		seconds = -seconds;
+		if (floor(seconds) != seconds)
+			seconds += 1; // make floor work in the other direction
+	}
+	int minutes = floor(seconds / 60);
+	seconds -= minutes * 60;
+	if (negative)
+		return sprintf("-%d:%02d", minutes, seconds);
+	return sprintf("%d:%02d", minutes, 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, bool compact)
+{
+	if (tm < 0)
+	{
+		if (compact)
+			return strcat("0.0", hundredths ? "0" : "");
+		else
+			return strcat("0:00.0", hundredths ? "0" : "");
+	}
+	int acc = hundredths ? 6000 : 600;
+	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 + 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, compact) clockedtime_tostring(tm, false, compact)
+#define mmssth(tm, compact) clockedtime_tostring(tm, true, compact)
+
 ERASEABLE
 string format_time(float seconds)
 {
@@ -139,26 +190,6 @@ string format_time(float seconds)
 	else return sprintf(_("%02d:%02d:%02d"), hours, minutes, seconds);
 }
 
-ERASEABLE
-string mmsss(float tenths)
-{
-	tenths = floor(tenths + 0.5);
-	float minutes = floor(tenths / 600);
-	tenths -= minutes * 600;
-	string s = ftos(1000 + tenths);
-	return strcat(ftos(minutes), ":", substring(s, 1, 2), ".", substring(s, 3, 1));
-}
-
-ERASEABLE
-string mmssss(float hundredths)
-{
-	hundredths = floor(hundredths + 0.5);
-	float minutes = floor(hundredths / 6000);
-	hundredths -= minutes * 6000;
-	string s = ftos(10000 + hundredths);
-	return strcat(ftos(minutes), ":", substring(s, 1, 2), ".", substring(s, 3, 2));
-}
-
 int ColorTranslateMode;
 
 ERASEABLE
@@ -374,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
@@ -392,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;
@@ -538,7 +570,7 @@ vector checkColorCode(string theText, int text_len, int pos, bool check_at_the_e
 	int ofs = cc_len;
 	if (!check_at_the_end)
 		ofs--;
-	for (; ofs >= 1; ofs--)
+	for (; ofs >= 1; --ofs)
 	{
 		if (!(pos >= ofs && text_len >= pos + (cc_len - ofs)))
 			continue;