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 > MAX_SCOREBOARD || !svs.connectedclients[entnum-1])
+ if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
{
Con_Printf ("tried to sprint to a non-client\n");
return;
}
- client = svs.connectedclients[entnum-1];
+ 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 > MAX_SCOREBOARD || !svs.connectedclients[entnum-1])
+ if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
{
Con_Printf ("tried to sprint to a non-client\n");
return;
}
- client = svs.connectedclients[entnum-1];
+ 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);
}
// cycle to the next one
- check = bound(1, check, MAX_SCOREBOARD);
- if (check == MAX_SCOREBOARD)
+ check = bound(1, check, svs.maxclients);
+ if (check == svs.maxclients)
i = 1;
else
i = check + 1;
// count the cost
pr_xfunction->builtinsprofile++;
// wrap around
- if (i == MAX_SCOREBOARD+1)
+ if (i == svs.maxclients+1)
i = 1;
// look up the client's edict
ent = EDICT_NUM(i);
client_t *old;
entnum = G_EDICTNUM(OFS_PARM0);
- if (entnum < 1 || entnum > MAX_SCOREBOARD)
- Host_Error ("Parm 0 not a client");
+ if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
+ {
+ Con_Printf("Can't stuffcmd to a non-client");
+ return;
+ }
str = G_STRING(OFS_PARM1);
old = host_client;
- if ((host_client = svs.connectedclients[entnum-1]))
+ if ((host_client = svs.clients + entnum-1) && host_client->netconnection)
Host_ClientCommands ("%s", str);
host_client = old;
}
*/
void PF_localcmd (void)
{
- char *str;
-
- str = G_STRING(OFS_PARM0);
- Cbuf_AddText (str);
+ Cbuf_AddText(G_STRING(OFS_PARM0));
}
/*
*/
void PF_cvar (void)
{
- char *str;
-
- str = G_STRING(OFS_PARM0);
-
- G_FLOAT(OFS_RETURN) = Cvar_VariableValue (str);
+ G_FLOAT(OFS_RETURN) = Cvar_VariableValue(G_STRING(OFS_PARM0));
}
/*
*/
void PF_cvar_set (void)
{
- char *var, *val;
-
- var = G_STRING(OFS_PARM0);
- val = G_STRING(OFS_PARM1);
-
- Cvar_Set (var, val);
+ Cvar_Set(G_STRING(OFS_PARM0), G_STRING(OFS_PARM1));
}
/*
*/
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)
v = G_FLOAT(OFS_PARM0);
s = PR_GetTempString();
- // LordHavoc: ftos improvement
- sprintf (s, "%g", v);
+ if ((float)((int)v) == v)
+ sprintf(s, "%i", (int)v);
+ else
+ sprintf(s, "%f", v);
G_INT(OFS_RETURN) = PR_SetString(s);
}
ed = G_EDICT(OFS_PARM0);
if (ed == sv.edicts)
Host_Error("remove: tried to remove world\n");
- if (NUM_FOR_EDICT(ed) <= MAX_SCOREBOARD)
+ if (NUM_FOR_EDICT(ed) <= svs.maxclients)
Host_Error("remove: tried to remove a client\n");
ED_Free (ed);
}
Host_Error ("PF_Precache_*: Precache can only be done in spawn functions");
s = G_STRING(OFS_PARM0);
- if (sv.worldmodel->brushq1.ishlbsp && ((!s) || (!s[0])))
+ if (sv.worldmodel->brush.ishlbsp && ((!s) || (!s[0])))
return;
G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
PR_CheckEmptyString (s);
if (sv.state != ss_active)
return;
- for (j = 0;j < MAX_SCOREBOARD;j++)
+ for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
{
- if ((client = svs.connectedclients[j]))
+ if (client->netconnection)
{
MSG_WriteChar (&client->message, svc_lightstyle);
MSG_WriteChar (&client->message,style);
*/
void PF_pointcontents (void)
{
- G_FLOAT(OFS_RETURN) = SV_PointContents(G_VECTOR(OFS_PARM0));
+ G_FLOAT(OFS_RETURN) = SV_PointQ1Contents(G_VECTOR(OFS_PARM0));
}
/*
case MSG_ONE:
ent = PROG_TO_EDICT(pr_global_struct->msg_entity);
entnum = NUM_FOR_EDICT(ent);
- if (entnum < 1 || entnum > MAX_SCOREBOARD || svs.connectedclients[entnum-1] == NULL)
- Host_Error("WriteDest: not a client");
- return &svs.connectedclients[entnum-1]->message;
+ if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
+ Con_Printf("WriteDest: tried to write to non-client\n");
+ return &svs.clients[entnum-1].message;
case MSG_ALL:
return &sv.reliable_datagram;
ent = G_EDICT(OFS_PARM0);
i = NUM_FOR_EDICT(ent);
- if (i < 1 || i > MAX_SCOREBOARD || !svs.connectedclients[i-1])
- Host_Error ("Entity is not a client");
+ if (i < 1 || i > svs.maxclients || !svs.clients[i-1].active)
+ {
+ Con_Printf("tried to setspawnparms on a non-client\n");
+ return;
+ }
// copy spawn parms out of the client_t
- client = svs.connectedclients[i-1];
+ client = svs.clients + i-1;
for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
(&pr_global_struct->parm1)[i] = client->spawn_parms[i];
}
entnum = G_EDICTNUM(OFS_PARM0);
i = G_FLOAT(OFS_PARM1);
- if (entnum < 1 || entnum > MAX_SCOREBOARD || !(client = svs.connectedclients[entnum-1]))
+ if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
{
Con_Printf ("tried to setcolor a non-client\n");
return;
}
+ client = svs.clients + entnum-1;
if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
val->_float = i;
client->colors = i;
if (modelindex < 1 || modelindex >= MAX_MODELS)
return NULL;
model = sv.models[modelindex];
- if (model->type != mod_brush)
- return NULL;
if (surfnum < 0 || surfnum >= model->brushq1.nummodelsurfaces)
return NULL;
return model->brushq1.surfaces + surfnum + model->brushq1.firstmodelsurface;
if (modelindex < 1 || modelindex >= MAX_MODELS)
return;
model = sv.models[modelindex];
- if (model->type != mod_brush)
+ if (!model->brushq1.numsurfaces)
return;
// FIXME: implement rotation/scaling
//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)
//find client for this entity
i = (NUM_FOR_EDICT(G_EDICT(OFS_PARM0)) - 1);
- if (i < 0 || i >= MAX_SCOREBOARD || !svs.connectedclients[i])
- Host_Error("PF_clientcommand: entity is not a client");
+ if (i < 0 || i >= svs.maxclients || !svs.clients[i].active)
+ {
+ Con_Printf("PF_clientcommand: entity is not a client");
+ return;
+ }
temp_client = host_client;
- host_client = svs.connectedclients[i];
+ host_client = svs.clients + i;
Cmd_ExecuteString (G_STRING(OFS_PARM1), src_client);
host_client = temp_client;
}
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