mempool_t *pr_strings_mempool;
-#define MAX_VARSTRING 4096
+// LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
+#define STRINGTEMP_BUFFERS 16
+#define STRINGTEMP_LENGTH 4096
+static char pr_string_temp[STRINGTEMP_BUFFERS][STRINGTEMP_LENGTH];
+static int pr_string_tempindex = 0;
-char pr_varstring_temp[MAX_VARSTRING];
+static char *PR_GetTempString(void)
+{
+ char *s;
+ s = pr_string_temp[pr_string_tempindex];
+ pr_string_tempindex = (pr_string_tempindex + 1) % STRINGTEMP_BUFFERS;
+ return s;
+}
#define RETURN_EDICT(e) (((int *)pr_globals)[OFS_RETURN] = EDICT_TO_PROG(e))
*/
-char *PF_VarString (int first)
+void PF_VarString(int first, char *out, int outlength)
{
int i;
const char *s;
- char *out, *outend;
+ char *outend;
- out = pr_varstring_temp;
- outend = pr_varstring_temp + sizeof(pr_varstring_temp) - 1;
+ outend = out + outlength - 1;
for (i = first;i < pr_argc && out < outend;i++)
{
s = G_STRING((OFS_PARM0+i*3));
*out++ = *s++;
}
*out++ = 0;
- return pr_varstring_temp;
}
char *ENGINE_EXTENSIONS =
"DP_QC_SINCOSSQRTPOW "
"DP_QC_TRACEBOX "
"DP_QC_TRACETOSS "
+"DP_QC_TRACE_MOVETYPE_WORLDONLY "
+"DP_QC_TRACE_MOVETYPE_HITMODEL "
"DP_QC_VECTORVECTORS "
"DP_QUAKE2_MODEL "
"DP_QUAKE3_MODEL "
*/
void PF_error (void)
{
- char *s;
edict_t *ed;
+ char string[STRINGTEMP_LENGTH];
- s = PF_VarString(0);
- Con_Printf ("======SERVER ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), s);
+ PF_VarString(0, string, sizeof(string));
+ Con_Printf ("======SERVER ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), string);
ed = PROG_TO_EDICT(pr_global_struct->self);
ED_Print (ed);
*/
void PF_objerror (void)
{
- char *s;
edict_t *ed;
+ char string[STRINGTEMP_LENGTH];
- s = PF_VarString(0);
- Con_Printf ("======OBJECT ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), s);
+ PF_VarString(0, string, sizeof(string));
+ Con_Printf ("======OBJECT ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), string);
ed = PROG_TO_EDICT(pr_global_struct->self);
ED_Print (ed);
ED_Free (ed);
*/
void PF_bprint (void)
{
- char *s;
-
- s = PF_VarString(0);
- SV_BroadcastPrintf ("%s", s);
+ char string[STRINGTEMP_LENGTH];
+ PF_VarString(0, string, sizeof(string));
+ SV_BroadcastPrintf("%s", string);
}
/*
*/
void PF_sprint (void)
{
- char *s;
client_t *client;
int entnum;
+ char string[STRINGTEMP_LENGTH];
entnum = G_EDICTNUM(OFS_PARM0);
- s = PF_VarString(1);
if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
{
client = svs.clients + entnum-1;
if (!client->netconnection)
return;
+ PF_VarString(1, string, sizeof(string));
MSG_WriteChar(&client->message,svc_print);
- MSG_WriteString(&client->message, s );
+ MSG_WriteString(&client->message, string);
}
*/
void PF_centerprint (void)
{
- char *s;
client_t *client;
int entnum;
+ char string[STRINGTEMP_LENGTH];
entnum = G_EDICTNUM(OFS_PARM0);
- s = PF_VarString(1);
if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
{
client = svs.clients + entnum-1;
if (!client->netconnection)
return;
+ PF_VarString(1, string, sizeof(string));
MSG_WriteChar(&client->message,svc_centerprint);
- MSG_WriteString(&client->message, s );
+ MSG_WriteString(&client->message, string);
}
*/
void PF_dprint (void)
{
- Con_DPrintf ("%s",PF_VarString(0));
-}
-
-// LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
-#define STRINGTEMP_BUFFERS 16
-#define STRINGTEMP_LENGTH 128
-static char pr_string_temp[STRINGTEMP_BUFFERS][STRINGTEMP_LENGTH];
-static int pr_string_tempindex = 0;
-
-static char *PR_GetTempString(void)
-{
- char *s;
- s = pr_string_temp[pr_string_tempindex];
- pr_string_tempindex = (pr_string_tempindex + 1) % STRINGTEMP_BUFFERS;
- return s;
+ char string[STRINGTEMP_LENGTH];
+ if (developer.integer)
+ {
+ PF_VarString(0, string, sizeof(string));
+ Con_Printf("%s",string);
+ }
}
void PF_ftos (void)
if (sv.state != ss_active)
return;
- for (j = 0, host_client = svs.clients;j < svs.maxclients;j++, host_client++)
+ for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
{
if (client->netconnection)
{
//float(string s) stof = #81; // get numerical value from a string
void PF_stof(void)
{
- char *s = PF_VarString(0);
- G_FLOAT(OFS_RETURN) = atof(s);
+ char string[STRINGTEMP_LENGTH];
+ PF_VarString(0, string, sizeof(string));
+ G_FLOAT(OFS_RETURN) = atof(string);
}
//float(string filename, float mode) fopen = #110; // opens a file inside quake/gamedir/data/ (mode is FILE_READ, FILE_APPEND, or FILE_WRITE), returns fhandle >= 0 if successful, or fhandle < 0 if unable to open file for any reason
void PF_fgets(void)
{
int c, end;
- static char string[MAX_VARSTRING];
+ static char string[STRINGTEMP_LENGTH];
int filenum = G_FLOAT(OFS_PARM0);
if (filenum < 0 || filenum >= MAX_PRFILES)
{
c = FS_Getc(pr_files[filenum]);
if (c == '\r' || c == '\n' || c < 0)
break;
- if (end < MAX_VARSTRING - 1)
+ if (end < STRINGTEMP_LENGTH - 1)
string[end++] = c;
}
string[end] = 0;
void PF_fputs(void)
{
int stringlength;
- char *s = PF_VarString(1);
+ char string[STRINGTEMP_LENGTH];
int filenum = G_FLOAT(OFS_PARM0);
if (filenum < 0 || filenum >= MAX_PRFILES)
{
Con_Printf("PF_fputs: no such file handle %i (or file has been closed)\n", filenum);
return;
}
- if ((stringlength = strlen(s)))
- FS_Write(pr_files[filenum], s, stringlength);
+ PF_VarString(1, string, sizeof(string));
+ if ((stringlength = strlen(string)))
+ FS_Write(pr_files[filenum], string, stringlength);
if (developer.integer)
- Con_Printf("fputs: %s\n", s);
+ Con_Printf("fputs: %s\n", string);
}
//float(string s) strlen = #114; // returns how many characters are in a string
//string(string s1, string s2) strcat = #115; // concatenates two strings (for example "abc", "def" would return "abcdef") and returns as a tempstring
void PF_strcat(void)
{
- char *s = PF_VarString(0);
+ char *s = PR_GetTempString();
+ PF_VarString(0, s, STRINGTEMP_LENGTH);
G_INT(OFS_RETURN) = PR_SetString(s);
}
//vector(string s) stov = #117; // returns vector value from a string
void PF_stov(void)
{
- Math_atov(PF_VarString(0), G_VECTOR(OFS_RETURN));
+ char string[STRINGTEMP_LENGTH];
+ PF_VarString(0, string, sizeof(string));
+ Math_atov(string, G_VECTOR(OFS_RETURN));
}
//string(string s) strzone = #118; // makes a copy of a string into the string zone and returns it, this is often used to keep around a tempstring for longer periods of time (tempstrings are replaced often)
if (tagentity != NULL && tagentity != sv.edicts && tagname && tagname[0])
{
modelindex = (int)tagentity->v->modelindex;
- if (modelindex >= 0 && modelindex < MAX_MODELS)
+ if (modelindex >= 0 && modelindex < MAX_MODELS && (model = sv.models[modelindex]))
{
- model = sv.models[modelindex];
if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames)
for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++)
if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name))
projects / xonotic / darkplaces.git / blobdiff