"DP_EF_FLAME "
"DP_EF_FULLBRIGHT "
"DP_EF_NODRAW "
+"DP_EF_NOSHADOW "
"DP_EF_RED "
"DP_EF_STARDUST "
"DP_ENT_ALPHA "
"DP_QC_CVAR_STRING "
"DP_QC_ETOS "
"DP_QC_FINDCHAIN "
+"DP_QC_FINDCHAINFLAGS "
"DP_QC_FINDCHAINFLOAT "
+"DP_QC_FINDFLAGS "
"DP_QC_FINDFLOAT "
"DP_QC_FS_SEARCH " // Black: same as in the menu qc
"DP_QC_GETLIGHT "
"DP_QC_GETSURFACE "
"DP_QC_MINMAXBOUND "
+"DP_QC_MULTIPLETEMPSTRINGS "
"DP_QC_RANDOMVEC "
"DP_QC_SINCOSSQRTPOW "
"DP_QC_TRACEBOX "
"DP_QUAKE2_MODEL "
"DP_QUAKE3_MODEL "
"DP_REGISTERCVAR "
+"DP_SND_DIRECTIONLESSATTNNONE "
+"DP_SND_OGGVORBIS "
+"DP_SND_STEREOWAV "
"DP_SOLIDCORPSE "
"DP_SPRITE32 "
"DP_SV_DRAWONLYTOCLIENT "
"DP_SV_EXTERIORMODELTOCLIENT "
"DP_SV_NODRAWTOCLIENT "
"DP_SV_PLAYERPHYSICS "
+"DP_SV_ROTATINGBMODEL "
"DP_SV_SETCOLOR "
"DP_SV_SLOWMO "
"DP_TE_BLOOD "
"KRIMZON_SV_PARSECLIENTCOMMAND "
"NEH_CMD_PLAY2 "
"NEH_RESTOREGAME "
+"NXQ_GFX_LETTERBOX "
+"TENEBRAE_GFX_DLIGHTS "
"TW_SV_STEPCONTROL "
;
char string[STRINGTEMP_LENGTH];
PF_VarString(0, string, sizeof(string));
- Con_Printf ("======SERVER ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), 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);
+ ED_Print(ed);
PF_ERROR("Program error");
}
char string[STRINGTEMP_LENGTH];
PF_VarString(0, string, sizeof(string));
- Con_Printf ("======OBJECT ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), 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_Print(ed);
ED_Free (ed);
}
{
char string[STRINGTEMP_LENGTH];
PF_VarString(0, string, sizeof(string));
- SV_BroadcastPrintf("%s", string);
+ SV_BroadcastPrint(string);
}
/*
if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
{
- Con_Printf ("tried to sprint to a non-client\n");
+ Con_Print("tried to sprint to a non-client\n");
return;
}
if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
{
- Con_Printf ("tried to sprint to a non-client\n");
+ Con_Print("tried to sprint to a non-client\n");
return;
}
yaw = 0;
else
{
- yaw = (int) (atan2(value1[1], value1[0]) * 180 / M_PI);
+ yaw = (atan2(value1[1], value1[0]) * 180 / M_PI);
if (yaw < 0)
yaw += 360;
}
*/
void PF_vectoangles (void)
{
- float *value1;
- float forward;
- float yaw, pitch;
+ double value1[3], forward, yaw, pitch;
- value1 = G_VECTOR(OFS_PARM0);
+ VectorCopy(G_VECTOR(OFS_PARM0), value1);
if (value1[1] == 0 && value1[0] == 0)
{
yaw = 270;
forward = sqrt(value1[0]*value1[0] + value1[1]*value1[1]);
- pitch = (int) (atan2(value1[2], forward) * 180 / M_PI);
+ pitch = (atan2(value1[2], forward) * 180 / M_PI);
if (pitch < 0)
pitch += 360;
}
- G_FLOAT(OFS_RETURN+0) = pitch;
- G_FLOAT(OFS_RETURN+1) = yaw;
- G_FLOAT(OFS_RETURN+2) = 0;
+ VectorSet(G_VECTOR(OFS_RETURN), pitch, yaw, 0);
}
/*
char *samp;
float *pos;
float vol, attenuation;
- int i, soundnum, large;
+ int soundnum, large;
pos = G_VECTOR (OFS_PARM0);
samp = G_STRING(OFS_PARM1);
if (!*check)
{
- Con_Printf ("no precache: %s\n", samp);
+ Con_Printf("no precache: %s\n", samp);
return;
}
else
MSG_WriteByte (&sv.signon, svc_spawnstaticsound);
- for (i=0 ; i<3 ; i++)
- MSG_WriteDPCoord(&sv.signon, pos[i]);
+ MSG_WriteVector(&sv.signon, pos, sv.protocol);
if (large)
MSG_WriteShort (&sv.signon, soundnum);
{
float *v1, *v2;
trace_t trace;
- int nomonsters;
+ int move;
edict_t *ent;
pr_xfunction->builtinsprofile += 30;
v1 = G_VECTOR(OFS_PARM0);
v2 = G_VECTOR(OFS_PARM1);
- nomonsters = G_FLOAT(OFS_PARM2);
+ move = G_FLOAT(OFS_PARM2);
ent = G_EDICT(OFS_PARM3);
- trace = SV_Move (v1, vec3_origin, vec3_origin, v2, nomonsters, ent);
+ trace = SV_Move (v1, vec3_origin, vec3_origin, v2, move, ent);
pr_global_struct->trace_allsolid = trace.allsolid;
pr_global_struct->trace_startsolid = trace.startsolid;
{
float *v1, *v2, *m1, *m2;
trace_t trace;
- int nomonsters;
+ int move;
edict_t *ent;
pr_xfunction->builtinsprofile += 30;
m1 = G_VECTOR(OFS_PARM1);
m2 = G_VECTOR(OFS_PARM2);
v2 = G_VECTOR(OFS_PARM3);
- nomonsters = G_FLOAT(OFS_PARM4);
+ move = G_FLOAT(OFS_PARM4);
ent = G_EDICT(OFS_PARM5);
- trace = SV_Move (v1, m1, m2, v2, nomonsters ? MOVE_NOMONSTERS : MOVE_NORMAL, ent);
+ trace = SV_Move (v1, m1, m2, v2, move, ent);
pr_global_struct->trace_allsolid = trace.allsolid;
pr_global_struct->trace_startsolid = trace.startsolid;
entnum = G_EDICTNUM(OFS_PARM0);
if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
{
- Con_Printf("Can't stuffcmd to a non-client");
+ Con_Print("Can't stuffcmd to a non-client\n");
return;
}
str = G_STRING(OFS_PARM1);
if (developer.integer)
{
PF_VarString(0, string, sizeof(string));
- Con_Printf("%s",string);
+ Con_Print(string);
}
}
RETURN_EDICT(chain);
}
+// LordHavoc: search for flags in float fields
+void PF_findflags (void)
+{
+ int e;
+ int f;
+ int s;
+ edict_t *ed;
+
+ e = G_EDICTNUM(OFS_PARM0);
+ f = G_INT(OFS_PARM1);
+ s = (int)G_FLOAT(OFS_PARM2);
+
+ for (e++ ; e < sv.num_edicts ; e++)
+ {
+ pr_xfunction->builtinsprofile++;
+ ed = EDICT_NUM(e);
+ if (ed->e->free)
+ continue;
+ if ((int)E_FLOAT(ed,f) & s)
+ {
+ RETURN_EDICT(ed);
+ return;
+ }
+ }
+
+ RETURN_EDICT(sv.edicts);
+}
+
+// LordHavoc: chained search for flags in float fields
+void PF_findchainflags (void)
+{
+ int i;
+ int f;
+ int s;
+ edict_t *ent, *chain;
+
+ chain = (edict_t *)sv.edicts;
+
+ f = G_INT(OFS_PARM0);
+ s = (int)G_FLOAT(OFS_PARM1);
+
+ ent = NEXT_EDICT(sv.edicts);
+ for (i = 1;i < sv.num_edicts;i++, ent = NEXT_EDICT(ent))
+ {
+ pr_xfunction->builtinsprofile++;
+ if (ent->e->free)
+ continue;
+ if (!((int)E_FLOAT(ent,f) & s))
+ continue;
+
+ ent->v->chain = EDICT_TO_PROG(chain);
+ chain = ent;
+ }
+
+ RETURN_EDICT(chain);
+}
+
void PR_CheckEmptyString (char *s)
{
if (s[0] <= ' ')
{
char *s;
int i;
+ int limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_SOUNDS);
if (sv.state != ss_loading)
PF_ERROR("PF_Precache_*: Precache can only be done in spawn functions");
G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
PR_CheckEmptyString (s);
- for (i=0 ; i<MAX_SOUNDS ; i++)
+ for (i=0 ; i<limit ; i++)
{
if (!sv.sound_precache[i])
{
{
char *s;
int i;
+ int limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_MODELS);
if (sv.state != ss_loading)
PF_ERROR("PF_Precache_*: Precache can only be done in spawn functions");
G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
PR_CheckEmptyString (s);
- for (i=0 ; i<MAX_MODELS ; i++)
+ for (i = 0;i < limit;i++)
{
if (!sv.model_precache[i])
{
void PF_WriteAngle (void)
{
- MSG_WriteAngle (WriteDest(), G_FLOAT(OFS_PARM1));
+ MSG_WriteAngle (WriteDest(), G_FLOAT(OFS_PARM1), sv.protocol);
}
void PF_WriteCoord (void)
{
- MSG_WriteDPCoord (WriteDest(), G_FLOAT(OFS_PARM1));
+ MSG_WriteCoord (WriteDest(), G_FLOAT(OFS_PARM1), sv.protocol);
}
void PF_WriteString (void)
MSG_WriteByte (&sv.signon, ent->v->skin);
for (i=0 ; i<3 ; i++)
{
- MSG_WriteDPCoord(&sv.signon, ent->v->origin[i]);
- MSG_WriteAngle(&sv.signon, ent->v->angles[i]);
+ MSG_WriteCoord(&sv.signon, ent->v->origin[i], sv.protocol);
+ MSG_WriteAngle(&sv.signon, ent->v->angles[i], sv.protocol);
}
// throw the entity away now
i = NUM_FOR_EDICT(ent);
if (i < 1 || i > svs.maxclients || !svs.clients[i-1].active)
{
- Con_Printf("tried to setspawnparms on a non-client\n");
+ Con_Print("tried to setspawnparms on a non-client\n");
return;
}
VectorMA(ambientcolor, 0.5, diffusecolor, G_VECTOR(OFS_RETURN));
}
-#define MAX_QC_CVARS 128
-cvar_t qc_cvar[MAX_QC_CVARS];
-int currentqc_cvar;
-
void PF_registercvar (void)
{
char *name, *value;
- cvar_t *variable;
name = G_STRING(OFS_PARM0);
value = G_STRING(OFS_PARM1);
G_FLOAT(OFS_RETURN) = 0;
+
// first check to see if it has already been defined
if (Cvar_FindVar (name))
return;
// check for overlap with a command
if (Cmd_Exists (name))
{
- Con_Printf ("PF_registercvar: %s is a command\n", name);
+ Con_Printf("PF_registercvar: %s is a command\n", name);
return;
}
- if (currentqc_cvar >= MAX_QC_CVARS)
- PF_ERROR("PF_registercvar: ran out of cvar slots\n");
+ Cvar_Get(name, value, 0);
-// copy the name and value
- variable = &qc_cvar[currentqc_cvar++];
- variable->name = Z_Malloc (strlen(name)+1);
- strcpy (variable->name, name);
- variable->string = Z_Malloc (strlen(value)+1);
- strcpy (variable->string, value);
- variable->value = atof (value);
-
- Cvar_RegisterVariable(variable);
G_FLOAT(OFS_RETURN) = 1; // success
}
if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
{
- Con_Printf ("tried to setcolor a non-client\n");
+ Con_Print("tried to setcolor a non-client\n");
return;
}
*/
void PF_effect (void)
{
+ int i;
char *s;
s = G_STRING(OFS_PARM1);
if (!s || !s[0])
PF_WARNING("effect: no model specified\n");
- SV_StartEffect(G_VECTOR(OFS_PARM0), SV_ModelIndex(s), G_FLOAT(OFS_PARM2), G_FLOAT(OFS_PARM3), G_FLOAT(OFS_PARM4));
+ i = SV_ModelIndex(s);
+ if (i < 0)
+ PF_WARNING("effect: model not precached\n");
+ SV_StartEffect(G_VECTOR(OFS_PARM0), i, G_FLOAT(OFS_PARM2), G_FLOAT(OFS_PARM3), G_FLOAT(OFS_PARM4));
}
void PF_te_blood (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_BLOOD);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
// velocity
MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[0], 127));
MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[1], 127));
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_BLOODSHOWER);
// min
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
// max
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
// speed
- MSG_WriteDPCoord(&sv.datagram, G_FLOAT(OFS_PARM2));
+ MSG_WriteCoord(&sv.datagram, G_FLOAT(OFS_PARM2), sv.protocol);
// count
MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
}
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_EXPLOSIONRGB);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
// color
MSG_WriteByte(&sv.datagram, bound(0, (int) (G_VECTOR(OFS_PARM1)[0] * 255), 255));
MSG_WriteByte(&sv.datagram, bound(0, (int) (G_VECTOR(OFS_PARM1)[1] * 255), 255));
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_PARTICLECUBE);
// min
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
// max
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
// velocity
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
// count
MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
// color
// gravity true/false
MSG_WriteByte(&sv.datagram, ((int) G_FLOAT(OFS_PARM5)) != 0);
// randomvel
- MSG_WriteDPCoord(&sv.datagram, G_FLOAT(OFS_PARM6));
+ MSG_WriteCoord(&sv.datagram, G_FLOAT(OFS_PARM6), sv.protocol);
}
void PF_te_particlerain (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_PARTICLERAIN);
// min
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
// max
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
// velocity
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
// count
MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
// color
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_PARTICLESNOW);
// min
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
// max
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
// velocity
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
// count
MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
// color
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_SPARK);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
// velocity
MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[0], 127));
MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[1], 127));
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_GUNSHOTQUAD);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_spikequad (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_SPIKEQUAD);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_superspikequad (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_SUPERSPIKEQUAD);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_explosionquad (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_EXPLOSIONQUAD);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_smallflash (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_SMALLFLASH);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_customflash (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_CUSTOMFLASH);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
// radius
MSG_WriteByte(&sv.datagram, bound(0, G_FLOAT(OFS_PARM1) / 8 - 1, 255));
// lifetime
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_GUNSHOT);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_spike (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_SPIKE);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_superspike (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_SUPERSPIKE);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_explosion (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_EXPLOSION);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_tarexplosion (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_TAREXPLOSION);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_wizspike (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_WIZSPIKE);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_knightspike (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_KNIGHTSPIKE);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_lavasplash (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_LAVASPLASH);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_teleport (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_TELEPORT);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
void PF_te_explosion2 (void)
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_EXPLOSION2);
// origin
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
// color
MSG_WriteByte(&sv.datagram, G_FLOAT(OFS_PARM1));
+ MSG_WriteByte(&sv.datagram, G_FLOAT(OFS_PARM2));
}
void PF_te_lightning1 (void)
// owner entity
MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
// start
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
// end
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
}
void PF_te_lightning2 (void)
// owner entity
MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
// start
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
// end
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
}
void PF_te_lightning3 (void)
// owner entity
MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
// start
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
// end
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
}
void PF_te_beam (void)
// owner entity
MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
// start
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
// end
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
}
void PF_te_plasmaburn (void)
{
MSG_WriteByte(&sv.datagram, svc_temp_entity);
MSG_WriteByte(&sv.datagram, TE_PLASMABURN);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
- MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+ MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
static void clippointtosurface(msurface_t *surf, vec3_t p, vec3_t out)
if (modelindex < 1 || modelindex >= MAX_MODELS)
return NULL;
model = sv.models[modelindex];
- if (surfnum < 0 || surfnum >= model->brushq1.nummodelsurfaces)
+ if (surfnum < 0 || surfnum >= model->nummodelsurfaces)
return NULL;
- return model->brushq1.surfaces + surfnum + model->brushq1.firstmodelsurface;
+ return model->brushq1.surfaces + surfnum + model->firstmodelsurface;
}
VectorSubtract(point, ed->v->origin, p);
best = -1;
bestdist = 1000000000;
- for (surfnum = 0;surfnum < model->brushq1.nummodelsurfaces;surfnum++)
+ for (surfnum = 0;surfnum < model->nummodelsurfaces;surfnum++)
{
- surf = model->brushq1.surfaces + surfnum + model->brushq1.firstmodelsurface;
+ surf = model->brushq1.surfaces + surfnum + model->firstmodelsurface;
dist = PlaneDiff(p, surf->plane);
dist = dist * dist;
if (dist < bestdist)
//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_fopen(void)
{
- int filenum, mode;
+ int filenum, mode, i;
char *modestring, *filename;
for (filenum = 0;filenum < MAX_PRFILES;filenum++)
if (pr_files[filenum] == NULL)
return;
}
filename = G_STRING(OFS_PARM0);
- // .. is parent directory on many platforms
- // / is parent directory on Amiga
+ // control characters do not cause issues with any platforms I know of, but they are usually annoying to deal with
+ // ../ is parent directory on many platforms
+ // // is parent directory on Amiga
+ // / at the beginning of a path is root on unix, and parent directory on Amiga
// : is root of drive on Amiga (also used as a directory separator on Mac, but / works there too, so that's a bad idea)
// \ is a windows-ism (so it's naughty to use it, / works on all platforms)
- if ((filename[0] == '.' && filename[1] == '.') || filename[0] == '/' || strrchr(filename, ':') || strrchr(filename, '\\'))
+ for (i = 0;filename[i];i++)
{
- Con_Printf("PF_fopen: dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", filename);
- G_FLOAT(OFS_RETURN) = -4;
- return;
+ if (filename[i] < ' ' || (filename[i] == '/' && filename[i+1] == '/') || (filename[i] == '.' && filename[i+1] == '.') || filename[i] == ':' || filename[i] == '\\' || filename[0] == '/')
+ {
+ Con_Printf("PF_fopen: dangerous/confusing/annoying/non-portable filename \"%s\" not allowed. (contains control characters or // or .. or : or \\ or begins with /)\n", filename);
+ G_FLOAT(OFS_RETURN) = -4;
+ return;
+ }
}
pr_files[filenum] = FS_Open(va("data/%s", filename), modestring, false);
+
+ if (pr_files[filenum] == NULL && modestring == "rb")
+ pr_files[filenum] = FS_Open(filename, modestring, false);
+
if (pr_files[filenum] == NULL)
G_FLOAT(OFS_RETURN) = -1;
else
c = FS_Getc(pr_files[filenum]);
if (developer.integer)
Con_Printf("fgets: %s\n", string);
- if (c >= 0)
+ if (c >= 0 || end)
G_INT(OFS_RETURN) = PR_SetString(string);
else
G_INT(OFS_RETURN) = 0;
i = (NUM_FOR_EDICT(G_EDICT(OFS_PARM0)) - 1);
if (i < 0 || i >= svs.maxclients || !svs.clients[i].active)
{
- Con_Printf("PF_clientcommand: entity is not a client");
+ Con_Print("PF_clientcommand: entity is not a client\n");
return;
}
//float(string s) tokenize = #441; // takes apart a string into individal words (access them with argv), returns how many
//this function originally written by KrimZon, made shorter by LordHavoc
-char **tokens = NULL;
-int max_tokens, num_tokens = 0;
+//20040203: rewritten by LordHavoc (no longer uses allocations)
+int num_tokens = 0;
+char *tokens[256], tokenbuf[4096];
void PF_tokenize (void)
{
+ int pos;
const char *p;
- char *str;
- str = G_STRING(OFS_PARM0);
-
- if (tokens != NULL)
- {
- int i;
- for (i=0;i<num_tokens;i++)
- Z_Free(tokens[i]);
- Z_Free(tokens);
- num_tokens = 0;
- }
-
- tokens = Z_Malloc(strlen(str) * sizeof(char *));
- max_tokens = strlen(str);
+ p = G_STRING(OFS_PARM0);
- for (p = str;COM_ParseToken(&p, false) && num_tokens < max_tokens;num_tokens++)
+ num_tokens = 0;
+ pos = 0;
+ while(COM_ParseToken(&p, false))
{
- tokens[num_tokens] = Z_Malloc(strlen(com_token) + 1);
- strcpy(tokens[num_tokens], com_token);
+ if (num_tokens >= (int)(sizeof(tokens)/sizeof(tokens[0])))
+ break;
+ if (pos + strlen(com_token) + 1 > sizeof(tokenbuf))
+ break;
+ tokens[num_tokens++] = tokenbuf + pos;
+ strcpy(tokenbuf + pos, com_token);
+ pos += strlen(com_token) + 1;
}
G_FLOAT(OFS_RETURN) = num_tokens;
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))
v->_float = i + 1;
+ // FIXME: use a model function to get tag info (need to handle skeletal)
if (v->_float == 0 && model->alias.aliasnum_tags)
for (i = 0;i < model->alias.aliasnum_tags;i++)
if (!strcmp(tagname, model->alias.aliasdata_tags[i].name))
PF_te_knightspike, // #424 void(vector org) te_knightspike (DP_TE_STANDARDEFFECTBUILTINS)
PF_te_lavasplash, // #425 void(vector org) te_lavasplash (DP_TE_STANDARDEFFECTBUILTINS)
PF_te_teleport, // #426 void(vector org) te_teleport (DP_TE_STANDARDEFFECTBUILTINS)
-PF_te_explosion2, // #427 void(vector org, float color) te_explosion2 (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_explosion2, // #427 void(vector org, float colorstart, float colorlength) te_explosion2 (DP_TE_STANDARDEFFECTBUILTINS)
PF_te_lightning1, // #428 void(entity own, vector start, vector end) te_lightning1 (DP_TE_STANDARDEFFECTBUILTINS)
PF_te_lightning2, // #429 void(entity own, vector start, vector end) te_lightning2 (DP_TE_STANDARDEFFECTBUILTINS)
PF_te_lightning3, // #430 void(entity own, vector start, vector end) te_lightning3 (DP_TE_STANDARDEFFECTBUILTINS)
PF_search_getsize, // #446
PF_search_getfilename, // #447
PF_cvar_string, // #448 string(string s) cvar_string (DP_QC_CVAR_STRING)
-NULL, // #449
-a a a a a // #450-499 (LordHavoc)
+PF_findflags, // #449 entity(entity start, .float fld, float match) findflags (DP_QC_FINDFLAGS)
+PF_findchainflags, // #450 entity(.float fld, float match) findchainflags (DP_QC_FINDCHAINFLAGS)
+NULL, // #451
+NULL, // #452
+NULL, // #453
+NULL, // #454
+NULL, // #455
+NULL, // #456
+NULL, // #457
+NULL, // #458
+NULL, // #459
+a a a a // #460-499 (LordHavoc)
};
builtin_t *pr_builtins = pr_builtin;
void PR_Cmd_Init(void)
{
- pr_strings_mempool = Mem_AllocPool("pr_stringszone");
+ pr_strings_mempool = Mem_AllocPool("pr_stringszone", 0, NULL);
PR_Files_Init();
PR_Search_Init();
}
projects / xonotic / darkplaces.git / blobdiff