{
int i;
char t[17];
+ size_t t_len;
VM_SAFEPARMCOUNT(1, VM_CL_getstats);
i = (int)PRVM_G_FLOAT(OFS_PARM0);
if(i < 0 || i > MAX_CL_STATS-4)
VM_Warning(prog, "VM_CL_getstats: index>MAX_CL_STATS-4 or index<0\n");
return;
}
- dp_strlcpy(t, (char*)&cl.stats[i], sizeof(t));
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, t);
+ t_len = dp_strlcpy(t, (char*)&cl.stats[i], sizeof(t));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, t, t_len);
}
//#333 void(entity e, float mdlindex) setmodelindex (EXT_CSQC)
//#348 string(float playernum, string keyname) getplayerkeyvalue (EXT_CSQC)
static void VM_CL_getplayerkey (prvm_prog_t *prog)
{
- int i;
- char t[128];
- const char *c;
+ int i;
+ char t[128];
+ size_t t_len;
+ const char *c;
VM_SAFEPARMCOUNT(2, VM_CL_getplayerkey);
t[0] = 0;
if(!strcasecmp(c, "name"))
- dp_strlcpy(t, cl.scores[i].name, sizeof(t));
+ t_len = dp_strlcpy(t, cl.scores[i].name, sizeof(t));
else
if(!strcasecmp(c, "frags"))
- dpsnprintf(t, sizeof(t), "%i", cl.scores[i].frags);
+ t_len = dpsnprintf(t, sizeof(t), "%i", cl.scores[i].frags);
else
if(!strcasecmp(c, "ping"))
- dpsnprintf(t, sizeof(t), "%i", cl.scores[i].qw_ping);
+ t_len = dpsnprintf(t, sizeof(t), "%i", cl.scores[i].qw_ping);
else
if(!strcasecmp(c, "pl"))
- dpsnprintf(t, sizeof(t), "%i", cl.scores[i].qw_packetloss);
+ t_len = dpsnprintf(t, sizeof(t), "%i", cl.scores[i].qw_packetloss);
else
if(!strcasecmp(c, "movementloss"))
- dpsnprintf(t, sizeof(t), "%i", cl.scores[i].qw_movementloss);
+ t_len = dpsnprintf(t, sizeof(t), "%i", cl.scores[i].qw_movementloss);
else
if(!strcasecmp(c, "entertime"))
- dpsnprintf(t, sizeof(t), "%f", cl.scores[i].qw_entertime);
+ t_len = dpsnprintf(t, sizeof(t), "%f", cl.scores[i].qw_entertime);
else
if(!strcasecmp(c, "colors"))
- dpsnprintf(t, sizeof(t), "%i", cl.scores[i].colors);
+ t_len = dpsnprintf(t, sizeof(t), "%i", cl.scores[i].colors);
else
if(!strcasecmp(c, "topcolor"))
- dpsnprintf(t, sizeof(t), "%i", cl.scores[i].colors & 0xf0);
+ t_len = dpsnprintf(t, sizeof(t), "%i", cl.scores[i].colors & 0xf0);
else
if(!strcasecmp(c, "bottomcolor"))
- dpsnprintf(t, sizeof(t), "%i", (cl.scores[i].colors &15)<<4);
+ t_len = dpsnprintf(t, sizeof(t), "%i", (cl.scores[i].colors &15)<<4);
else
if(!strcasecmp(c, "viewentity"))
- dpsnprintf(t, sizeof(t), "%i", i+1);
+ t_len = dpsnprintf(t, sizeof(t), "%i", i+1);
if(!t[0])
return;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, t);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, t, t_len);
}
//#351 void(vector origin, vector forward, vector right, vector up) SetListener (EXT_CSQC)
Cmd_AddCommand(CF_CLIENT, PRVM_G_STRING(OFS_PARM0), NULL, "console command created by QuakeC");
}
-//#360 float() readbyte (EXT_CSQC)
+//#360 float() ReadByte (EXT_CSQC)
static void VM_CL_ReadByte (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_CL_ReadByte);
PRVM_G_FLOAT(OFS_RETURN) = MSG_ReadByte(&cl_message);
}
-//#361 float() readchar (EXT_CSQC)
+//#361 float() ReadChar (EXT_CSQC)
static void VM_CL_ReadChar (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_CL_ReadChar);
PRVM_G_FLOAT(OFS_RETURN) = MSG_ReadChar(&cl_message);
}
-//#362 float() readshort (EXT_CSQC)
+//#362 float() ReadShort (EXT_CSQC)
static void VM_CL_ReadShort (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_CL_ReadShort);
PRVM_G_FLOAT(OFS_RETURN) = MSG_ReadShort(&cl_message);
}
-//#363 float() readlong (EXT_CSQC)
+//#363 float() ReadLong (EXT_CSQC)
static void VM_CL_ReadLong (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_CL_ReadLong);
PRVM_G_FLOAT(OFS_RETURN) = MSG_ReadLong(&cl_message);
}
-//#364 float() readcoord (EXT_CSQC)
+//#364 float() ReadCoord (EXT_CSQC)
static void VM_CL_ReadCoord (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_CL_ReadCoord);
PRVM_G_FLOAT(OFS_RETURN) = MSG_ReadCoord(&cl_message, cls.protocol);
}
-//#365 float() readangle (EXT_CSQC)
+//#365 float() ReadAngle (EXT_CSQC)
static void VM_CL_ReadAngle (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_CL_ReadAngle);
PRVM_G_FLOAT(OFS_RETURN) = MSG_ReadAngle(&cl_message, cls.protocol);
}
-//#366 string() readstring (EXT_CSQC)
+//#366 string() ReadString (EXT_CSQC)
static void VM_CL_ReadString (prvm_prog_t *prog)
{
+ size_t cl_readstring_len;
+
VM_SAFEPARMCOUNT(0, VM_CL_ReadString);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)));
+ cl_readstring_len = MSG_ReadString_len(&cl_message, cl_readstring, sizeof(cl_readstring));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cl_readstring, cl_readstring_len);
}
-//#367 float() readfloat (EXT_CSQC)
+//#367 float() ReadFloat (EXT_CSQC)
static void VM_CL_ReadFloat (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_CL_ReadFloat);
PRVM_G_FLOAT(OFS_RETURN) = MSG_ReadFloat(&cl_message);
}
-//#501 string() readpicture (DP_CSQC_READWRITEPICTURE)
+//#501 string() ReadPicture (DP_CSQC_READWRITEPICTURE)
extern cvar_t cl_readpicture_force;
static void VM_CL_ReadPicture (prvm_prog_t *prog)
{
const char *name;
+ size_t name_len;
unsigned char *data;
unsigned char *buf;
unsigned short size;
VM_SAFEPARMCOUNT(0, VM_CL_ReadPicture);
- name = MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring));
+ name_len = MSG_ReadString_len(&cl_message, cl_readstring, sizeof(cl_readstring));
+ name = cl_readstring;
size = (unsigned short) MSG_ReadShort(&cl_message);
// check if a texture of that name exists
}
}
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, name);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, name, name_len);
}
//////////////////////////////////////////////////////////
Matrix4x4_ToVectors(&tag_localmatrix, forward, left, up, origin);
PRVM_clientglobalfloat(gettaginfo_parent) = parentindex;
- PRVM_clientglobalstring(gettaginfo_name) = tagname ? PRVM_SetTempString(prog, tagname) : 0;
+ PRVM_clientglobalstring(gettaginfo_name) = tagname ? PRVM_SetTempString(prog, tagname, strlen(tagname)) : 0;
VectorCopy(forward, PRVM_clientglobalvector(gettaginfo_forward));
VectorScale(left, -1, PRVM_clientglobalvector(gettaginfo_right));
VectorCopy(up, PRVM_clientglobalvector(gettaginfo_up));
char string[VM_TEMPSTRING_MAXSIZE];
VM_SAFEPARMCOUNT(1, VM_CL_serverkey);
InfoString_GetValue(cl.qw_serverinfo, PRVM_G_STRING(OFS_PARM0), string, sizeof(string));
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string, strlen(string));
}
/*
return;
if (bonenum < 0 || bonenum >= skeleton->model->num_bones)
return;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, skeleton->model->data_bones[bonenum].name);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, skeleton->model->data_bones[bonenum].name, strlen(skeleton->model->data_bones[bonenum].name));
}
// #267 float(float skel, float bonenum) skel_get_boneparent = #267; // (FTE_CSQC_SKELETONOBJECTS) returns parent num for supplied bonenum, 0 if bonenum has no parent or bone does not exist (returned value is always less than bonenum, you can loop on this)
VM_loadfont, // #357 float(string fontname, string fontmaps, string sizes, float slot) loadfont (DP_GFX_FONTS)
VM_CL_loadcubemap, // #358 void(string cubemapname) loadcubemap (DP_GFX_)
NULL, // #359
-VM_CL_ReadByte, // #360 float() readbyte (EXT_CSQC)
-VM_CL_ReadChar, // #361 float() readchar (EXT_CSQC)
-VM_CL_ReadShort, // #362 float() readshort (EXT_CSQC)
-VM_CL_ReadLong, // #363 float() readlong (EXT_CSQC)
-VM_CL_ReadCoord, // #364 float() readcoord (EXT_CSQC)
-VM_CL_ReadAngle, // #365 float() readangle (EXT_CSQC)
-VM_CL_ReadString, // #366 string() readstring (EXT_CSQC)
-VM_CL_ReadFloat, // #367 float() readfloat (EXT_CSQC)
+VM_CL_ReadByte, // #360 float() ReadByte (EXT_CSQC)
+VM_CL_ReadChar, // #361 float() ReadChar (EXT_CSQC)
+VM_CL_ReadShort, // #362 float() ReadShort (EXT_CSQC)
+VM_CL_ReadLong, // #363 float() ReadLong (EXT_CSQC)
+VM_CL_ReadCoord, // #364 float() ReadCoord (EXT_CSQC)
+VM_CL_ReadAngle, // #365 float() ReadAngle (EXT_CSQC)
+VM_CL_ReadString, // #366 string() ReadString (EXT_CSQC)
+VM_CL_ReadFloat, // #367 float() ReadFloat (EXT_CSQC)
NULL, // #368
NULL, // #369
NULL, // #370
projects / xonotic / darkplaces.git / blobdiff