darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-01-18 14:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adding strcat builtin to qcvm

Browse source
This commit is contained in:
Wolfgang Bumiller 2012-12-23 19:05:39 +01:00
parent 3c9283cc41
commit 275b6f777a
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/qcvm.1
View file

@ -83,6 +83,9 @@ Get the entity ID as string.
.TP
.RI "9) " float " stof(" string ") = " "#9" ;
Convert a string to a float.
.TP
.RI "10) " string " strcat(" string ", " string ") = " "#10" ;
Concatenate two strings, returning a tempstring.
.SH BUGS
Please report bugs on <http://github.com/graphitemaster/gmqcc/issues>,
or see <http://graphitemaster.github.com/gmqcc> on how to contact us.

27
exec.c
View file

@ -744,6 +744,30 @@ static int qc_vlen(qc_program *prog)
return 0;
}
static int qc_strcat(qc_program *prog)
{
char *buffer;
size_t len1, len2;
char *cstr1, *cstr2;
qcany *str1, *str2;
qcany out;
CheckArgs(2);
str1 = GetArg(0);
str2 = GetArg(1);
cstr1 = prog_getstring(prog, str1->string);
cstr2 = prog_getstring(prog, str2->string);
len1 = strlen(cstr1);
len2 = strlen(cstr2);
buffer = (char*)mem_a(len1 + len2 + 1);
memcpy(buffer, cstr1, len1);
memcpy(buffer+len1, cstr2, len2+1);
out.string = prog_tempstring(prog, buffer);
mem_d(buffer);
Return(out);
return 0;
}
static prog_builtin qc_builtins[] = {
NULL,
&qc_print, /* 1 */
@ -754,7 +778,8 @@ static prog_builtin qc_builtins[] = {
&qc_error, /* 6 */
&qc_vlen, /* 7 */
&qc_etos, /* 8 */
&qc_stof /* 9 */
&qc_stof, /* 9 */
&qc_strcat /* 10 */
};
static size_t qc_builtins_count = sizeof(qc_builtins) / sizeof(qc_builtins[0]);