Merge branch 'drjaska/damagetext' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / util.qc

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 0b1b96880dc93985a6711c17a80183a795de0495..df54e3536b10acdf149037ddacc8b6c4c133da12 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -372,7 +372,7 @@ void depthfirst(entity start, .entity up, .entity downleft, .entity right, void(
 }
 
 #ifdef GAMEQC
-string ScoreString(int pFlags, float pValue)
+string ScoreString(int pFlags, float pValue, int rounds_played)
 {
        string valstr;
        float l;
@@ -384,7 +384,9 @@ string ScoreString(int pFlags, float pValue)
        else if(pFlags & SFL_RANK)
                valstr = (pValue < 256 ? count_ordinal(pValue) : _("N/A"));
        else if(pFlags & SFL_TIME)
-               valstr = TIME_ENCODED_TOSTRING(pValue);
+               valstr = TIME_ENCODED_TOSTRING(pValue, true);
+       else if (rounds_played)
+               valstr = sprintf("%.1f", pValue / rounds_played);
        else
                valstr = ftos(pValue);
 
@@ -442,7 +444,7 @@ vector decompressShortVector(int data)
        float q = (data & 0x0F80) / 0x80;
        int len = (data & 0x007F);
 
-       //print("\ndecompress: p ", ftos(p)); print("q ", ftos(q)); print("len ", ftos(len), "\n");
+       //print("\ndecompress: p:", ftos(p)); print(" q:", ftos(q)); print(" len:", ftos(len), "\n");
 
        if(p == 0)
        {
@@ -455,7 +457,7 @@ vector decompressShortVector(int data)
        }
        else
        {
-               q   = .19634954084936207740 * q;
+               q = .19634954084936207740 * q;
                p = .19634954084936207740 * p - 1.57079632679489661922;
                out.x = cos(q) *  cos(p);
                out.y = sin(q) *  cos(p);
@@ -491,10 +493,10 @@ float compressShortVector(vector vec)
                        y = 30;
        }
        else
-               y = floor(0.5 + ang.y * 32 / 360)          & 31; // 0..360 to 0..32
+               y = floor(0.5 + ang.y * 32 / 360) & 31; // 0..360 to 0..32
        len = invertLengthLog(vlen(vec));
 
-       //print("compressed: p ", ftos(p)); print("y ", ftos(y)); print("len ", ftos(len), "\n");
+       //print("compressed: p:", ftos(p)); print(" y:", ftos(y)); print(" len:", ftos(len), "\n");
 
        return (p * 0x1000) + (y * 0x80) + len;
 }
@@ -870,14 +872,14 @@ float textLengthUpToWidth(string theText, float maxWidth, vector theSize, textLe
        return left;
 }
 
-float textLengthUpToLength(string theText, float maxWidth, textLengthUpToLength_lenFunction_t w)
+float textLengthUpToLength(string theText, int maxLength, textLengthUpToLength_lenFunction_t w)
 {
        // STOP.
        // The following function is SLOW.
        // For your safety and for the protection of those around you...
        // DO NOT CALL THIS AT HOME.
        // No really, don't.
-       if(w(theText) <= maxWidth)
+       if(w(theText) <= maxLength)
                return strlen(theText); // yeah!
 
        bool colors = (w("^7") == 0);
@@ -896,7 +898,7 @@ float textLengthUpToLength(string theText, float maxWidth, textLengthUpToLength_
                        ofs = (!res.x) ? 0 : res.x - res.y;
                }
 
-               if(w(substring(theText, 0, middle + ofs)) <= maxWidth)
+               if(w(substring(theText, 0, middle + ofs)) <= maxLength)
                        left = middle + ofs;
                else
                        right = middle;
@@ -941,17 +943,17 @@ string find_last_color_code(string s)
        return "";
 }
 
-string getWrappedLine(float w, vector theFontSize, textLengthUpToWidth_widthFunction_t tw)
+string getWrappedLine(float maxWidth, vector theFontSize, textLengthUpToWidth_widthFunction_t tw)
 {
        string s = getWrappedLine_remaining;
 
-       if(w <= 0)
+       if(maxWidth <= 0)
        {
                getWrappedLine_remaining = string_null;
                return s; // the line has no size ANYWAY, nothing would be displayed.
        }
 
-       int take_until = textLengthUpToWidth(s, w, theFontSize, tw);
+       int take_until = textLengthUpToWidth(s, maxWidth, theFontSize, tw);
        if(take_until > 0 && take_until < strlen(s))
        {
                int last_word = take_until - 1;
@@ -979,17 +981,17 @@ string getWrappedLine(float w, vector theFontSize, textLengthUpToWidth_widthFunc
        }
 }
 
-string getWrappedLineLen(float w, textLengthUpToLength_lenFunction_t tw)
+string getWrappedLineLen(int maxLength, textLengthUpToLength_lenFunction_t tw)
 {
        string s = getWrappedLine_remaining;
 
-       if(w <= 0)
+       if(maxLength <= 0)
        {
                getWrappedLine_remaining = string_null;
                return s; // the line has no size ANYWAY, nothing would be displayed.
        }
 
-       int take_until = textLengthUpToLength(s, w, tw);
+       int take_until = textLengthUpToLength(s, maxLength, tw);
        if(take_until > 0 && take_until < strlen(s))
        {
                int last_word = take_until - 1;