mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-05-31 00:30:57 +00:00
support %c for sprintf and make sprintf return a return string rather than a temp string
This commit is contained in:
parent
d084264c3a
commit
4dba10d613
2 changed files with 7 additions and 2 deletions
|
@ -586,8 +586,8 @@ PF_sprintf (progs_t *pr)
|
||||||
str = PR_NewMutableString (pr);
|
str = PR_NewMutableString (pr);
|
||||||
dstr = PR_GetMutableString (pr, str);
|
dstr = PR_GetMutableString (pr, str);
|
||||||
PR_Sprintf (pr, dstr, "PF_sprintf", fmt, count, args);
|
PR_Sprintf (pr, dstr, "PF_sprintf", fmt, count, args);
|
||||||
PR_MakeTempString (pr, str);
|
RETURN_STRING (pr, dstr->str);
|
||||||
R_STRING (pr) = str;
|
dstring_delete (dstr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -571,6 +571,10 @@ I_DoPrint (dstring_t *result, fmt_item_t *formatting)
|
||||||
dstring_appendstr (tmp, "s");
|
dstring_appendstr (tmp, "s");
|
||||||
PRINT (string);
|
PRINT (string);
|
||||||
break;
|
break;
|
||||||
|
case 'c':
|
||||||
|
dstring_appendstr (tmp, "c");
|
||||||
|
PRINT (integer);
|
||||||
|
break;
|
||||||
case 'i':
|
case 'i':
|
||||||
dstring_appendstr (tmp, "d");
|
dstring_appendstr (tmp, "d");
|
||||||
PRINT (integer);
|
PRINT (integer);
|
||||||
|
@ -723,6 +727,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
|
||||||
fi = &(*fi)->next;
|
fi = &(*fi)->next;
|
||||||
break;
|
break;
|
||||||
case 'i':
|
case 'i':
|
||||||
|
case 'c':
|
||||||
// integer
|
// integer
|
||||||
(*fi)->type = *c;
|
(*fi)->type = *c;
|
||||||
(*fi)->data.integer_var = P_INT (pr, fmt_count);
|
(*fi)->data.integer_var = P_INT (pr, fmt_count);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue