Merge branch 'master' into next

This commit is contained in:
Steel Titanium 2020-02-18 17:41:13 -05:00
commit da15c92568

View file

@ -2618,14 +2618,15 @@ const char * M_Ftrim (double f)
static char dig[9];/* "0." + 6 digits (6 is printf's default) */ static char dig[9];/* "0." + 6 digits (6 is printf's default) */
int i; int i;
/* I know I said it's the default, but just in case... */ /* I know I said it's the default, but just in case... */
sprintf(dig, "%.6g", modf(f, &f)); sprintf(dig, "%.6f", fabs(modf(f, &f)));
if (dig[0]) /* trim trailing zeroes */
for (i = strlen(dig)-1; dig[i] == '0'; --i)
;
if (dig[i] == '.')/* :NOTHING: */
return "";
else
{ {
for (i = strlen(dig); dig[i] == '0'; --i)
;
dig[i + 1] = '\0'; dig[i + 1] = '\0';
return &dig[1];/* skip the 0 */ return &dig[1];/* skip the 0 */
} }
else
return "";
} }