eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

QSG_DIMENSION_PLANES and TEI_SHOWLMP2 support added.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@94 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-08-31 23:58:18 +00:00
parent 2ed0e6a508
commit 4f6b0592b7
8 changed files with 731 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
engine/server/net_preparse.c
View file

@ -188,7 +188,7 @@ void NPP_Flush(void)
org[0] = (*(short*)&buffer[multicastpos])/8.0f; org[0] = (*(short*)&buffer[multicastpos])/8.0f;
org[1] = (*(short*)&buffer[multicastpos+2])/8.0f; org[1] = (*(short*)&buffer[multicastpos+2])/8.0f;
org[2] = (*(short*)&buffer[multicastpos+4])/8.0f; org[2] = (*(short*)&buffer[multicastpos+4])/8.0f;
SV_MulticastProtExt(org, multicasttype, requireextension, 0); SV_MulticastProtExt(org, multicasttype, FULLDIMENSIONMASK, requireextension, 0);
} }
writedest = NULL; writedest = NULL;
} }
@ -302,6 +302,7 @@ void NPP_NQWriteByte(int dest, qbyte data) //replacement write func (nq to qw)
data = svc_updatestatlong; //ho hum... let it through (should check size later.) data = svc_updatestatlong; //ho hum... let it through (should check size later.)
protocollen = 5; protocollen = 5;
break; break;
case svc_stufftext:
case svc_centerprint: case svc_centerprint:
break; break;
case svc_clearviewflags: case svc_clearviewflags:
@ -400,6 +401,7 @@ void NPP_NQWriteByte(int dest, qbyte data) //replacement write func (nq to qw)
break; break;
} }
break; break;
case svc_stufftext:
case svc_centerprint: case svc_centerprint:
break; break;
default: default:
@ -413,6 +415,7 @@ void NPP_NQWriteByte(int dest, qbyte data) //replacement write func (nq to qw)
switch(majortype) switch(majortype)
{ {
case svc_setname: case svc_setname:
case svc_stufftext:
case svc_centerprint: case svc_centerprint:
if (!data) if (!data)
protocollen = bufferlen; protocollen = bufferlen;
@ -796,7 +799,7 @@ void NPP_QWFlush(void)
org[0] = (*(short*)&buffer[multicastpos])/8.0f; org[0] = (*(short*)&buffer[multicastpos])/8.0f;
org[1] = (*(short*)&buffer[multicastpos+2])/8.0f; org[1] = (*(short*)&buffer[multicastpos+2])/8.0f;
org[2] = (*(short*)&buffer[multicastpos+4])/8.0f; org[2] = (*(short*)&buffer[multicastpos+4])/8.0f;
SV_MulticastProtExt(org, multicasttype, requireextension, 0); SV_MulticastProtExt(org, multicasttype, FULLDIMENSIONMASK, requireextension, 0);
} }
writedest = NULL; writedest = NULL;
} }
@ -1636,7 +1639,7 @@ void NPP_MVDFlush(void)
org[0] = (*(short*)&buffer[multicastpos])/8.0f; org[0] = (*(short*)&buffer[multicastpos])/8.0f;
org[1] = (*(short*)&buffer[multicastpos+2])/8.0f; org[1] = (*(short*)&buffer[multicastpos+2])/8.0f;
org[2] = (*(short*)&buffer[multicastpos+4])/8.0f; org[2] = (*(short*)&buffer[multicastpos+4])/8.0f;
SV_MulticastProtExt(org, multicasttype, requireextension, 0); SV_MulticastProtExt(org, multicasttype, FULLDIMENSIONMASK, requireextension, 0);
} }
writedest = NULL; writedest = NULL;
} }

695
engine/server/pr_cmds.c
View file

@ -51,13 +51,13 @@ cvar_t qc_nonetaccess = {"qc_nonetaccess", "0"}; //prevent write_... builtins fr
cvar_t pr_overridebuiltins = {"pr_overridebuiltins", "1"}; cvar_t pr_overridebuiltins = {"pr_overridebuiltins", "1"};
cvar_t pr_compatabilitytest = {"pr_compatabilitytest", "0", NULL, CVAR_LATCH};
cvar_t sv_addon[MAXADDONS]; cvar_t sv_addon[MAXADDONS];
char cvargroup_progs[] = "Progs variables"; char cvargroup_progs[] = "Progs variables";
int pr_teamfield; int pr_teamfield;
void PR_ClearThreads(void); void PR_ClearThreads(void);
@ -133,6 +133,9 @@ pbool QC_WriteFile(char *name, void *data, int len)
void ED_Spawned (struct edict_s *ent) void ED_Spawned (struct edict_s *ent)
{ {
ent->v.dimension_mask = 255;
ent->v.dimension_ghost = 0;
ent->v.dimension_physics = 255;
} }
pbool ED_CanFree (edict_t *ed) pbool ED_CanFree (edict_t *ed)
@ -368,6 +371,7 @@ void PR_Deinit(void)
void PR_LoadGlabalStruct(void) void PR_LoadGlabalStruct(void)
{ {
static float dimension_send_default;
int i; int i;
int *v; int *v;
nqglobalvars_t *pr_globals = pr_nqglobal_struct; nqglobalvars_t *pr_globals = pr_nqglobal_struct;
@ -434,6 +438,14 @@ void PR_LoadGlabalStruct(void)
globalfunc (false, SetChangeParms); globalfunc (false, SetChangeParms);
globalfloat (false, cycle_wrapped); globalfloat (false, cycle_wrapped);
globalfloat (false, dimension_send);
if (!((nqglobalvars_t*)pr_globals)->dimension_send)
{
dimension_send_default = 255;
((nqglobalvars_t*)pr_globals)->dimension_send = &dimension_send_default;
}
pr_teamfield = 0; pr_teamfield = 0;
SpectatorConnect = PR_FindFunction(svprogfuncs, "SpectatorConnect", PR_ANY); SpectatorConnect = PR_FindFunction(svprogfuncs, "SpectatorConnect", PR_ANY);
@ -741,6 +753,7 @@ void PR_Init(void)
Cvar_Register (&noexit, cvargroup_progs); Cvar_Register (&noexit, cvargroup_progs);
Cvar_Register (&progs, cvargroup_progs); Cvar_Register (&progs, cvargroup_progs);
Cvar_Register (&pr_compatabilitytest, cvargroup_progs);
Cvar_Register (&qc_nonetaccess, cvargroup_progs); Cvar_Register (&qc_nonetaccess, cvargroup_progs);
Cvar_Register (&pr_overridebuiltins, cvargroup_progs); Cvar_Register (&pr_overridebuiltins, cvargroup_progs);
@ -2054,9 +2067,10 @@ void PF_particle (progfuncs_t *prinst, globalvars_t *pr_globals) //I said it was
v = -128; v = -128;
MSG_WriteChar (&sv.nqmulticast, v); MSG_WriteChar (&sv.nqmulticast, v);
} }
MSG_WriteByte (&sv.nqmulticast, count); MSG_WriteByte (&sv.nqmulticast, count*20);
MSG_WriteByte (&sv.nqmulticast, color*20); MSG_WriteByte (&sv.nqmulticast, color);
#endif #endif
//for qw users (and not fte)
if (color == 73) if (color == 73)
{ {
MSG_WriteByte (&sv.multicast, svc_temp_entity); MSG_WriteByte (&sv.multicast, svc_temp_entity);
@ -2065,7 +2079,7 @@ void PF_particle (progfuncs_t *prinst, globalvars_t *pr_globals) //I said it was
MSG_WriteCoord (&sv.multicast, org[0]); MSG_WriteCoord (&sv.multicast, org[0]);
MSG_WriteCoord (&sv.multicast, org[1]); MSG_WriteCoord (&sv.multicast, org[1]);
MSG_WriteCoord (&sv.multicast, org[2]); MSG_WriteCoord (&sv.multicast, org[2]);
SV_MulticastProtExt(org, MULTICAST_PVS, 0, PEXT_HEXEN2); SV_MulticastProtExt(org, MULTICAST_PVS, pr_global_struct->dimension_send, 0, PEXT_HEXEN2);
} }
else if (color == 225) else if (color == 225)
{ {
@ -2074,8 +2088,9 @@ void PF_particle (progfuncs_t *prinst, globalvars_t *pr_globals) //I said it was
MSG_WriteCoord (&sv.multicast, org[0]); MSG_WriteCoord (&sv.multicast, org[0]);
MSG_WriteCoord (&sv.multicast, org[1]); MSG_WriteCoord (&sv.multicast, org[1]);
MSG_WriteCoord (&sv.multicast, org[2]); MSG_WriteCoord (&sv.multicast, org[2]);
SV_MulticastProtExt(org, MULTICAST_PVS, 0, PEXT_HEXEN2); SV_MulticastProtExt(org, MULTICAST_PVS, pr_global_struct->dimension_send, 0, PEXT_HEXEN2);
} }
//now we can start fte svc_particle stuff..
MSG_WriteByte (&sv.multicast, svc_particle); MSG_WriteByte (&sv.multicast, svc_particle);
MSG_WriteCoord (&sv.multicast, org[0]); MSG_WriteCoord (&sv.multicast, org[0]);
MSG_WriteCoord (&sv.multicast, org[1]); MSG_WriteCoord (&sv.multicast, org[1]);
@ -2091,7 +2106,7 @@ void PF_particle (progfuncs_t *prinst, globalvars_t *pr_globals) //I said it was
} }
MSG_WriteByte (&sv.multicast, count); MSG_WriteByte (&sv.multicast, count);
MSG_WriteByte (&sv.multicast, color); MSG_WriteByte (&sv.multicast, color);
SV_MulticastProtExt(org, MULTICAST_PVS, PEXT_HEXEN2, 0); SV_MulticastProtExt(org, MULTICAST_PVS, pr_global_struct->dimension_send, PEXT_HEXEN2, 0);
} }
void PF_te_blood (progfuncs_t *prinst, globalvars_t *pr_globals) void PF_te_blood (progfuncs_t *prinst, globalvars_t *pr_globals)
@ -2168,7 +2183,7 @@ void PF_particle2 (progfuncs_t *prinst, globalvars_t *pr_globals)
MSG_WriteByte (&sv.multicast, count); MSG_WriteByte (&sv.multicast, count);
MSG_WriteByte (&sv.multicast, effect); MSG_WriteByte (&sv.multicast, effect);
SV_MulticastProtExt (org, MULTICAST_PVS, PEXT_HEXEN2, 0); SV_MulticastProtExt (org, MULTICAST_PVS, pr_global_struct->dimension_send, PEXT_HEXEN2, 0);
} }
@ -2204,7 +2219,7 @@ void PF_particle3 (progfuncs_t *prinst, globalvars_t *pr_globals)
MSG_WriteByte (&sv.multicast, count); MSG_WriteByte (&sv.multicast, count);
MSG_WriteByte (&sv.multicast, effect); MSG_WriteByte (&sv.multicast, effect);
SV_MulticastProtExt (org, MULTICAST_PVS, PEXT_HEXEN2, 0); SV_MulticastProtExt (org, MULTICAST_PVS, pr_global_struct->dimension_send, PEXT_HEXEN2, 0);
} }
/* /*
@ -2238,7 +2253,7 @@ void PF_particle4 (progfuncs_t *prinst, globalvars_t *pr_globals)
MSG_WriteByte (&sv.multicast, count); MSG_WriteByte (&sv.multicast, count);
MSG_WriteByte (&sv.multicast, effect); MSG_WriteByte (&sv.multicast, effect);
SV_MulticastProtExt (org, MULTICAST_PVS, PEXT_HEXEN2, 0); SV_MulticastProtExt (org, MULTICAST_PVS, pr_global_struct->dimension_send, PEXT_HEXEN2, 0);
} }
void PF_particleexplosion(progfuncs_t *prinst, struct globalvars_s *pr_globals) void PF_particleexplosion(progfuncs_t *prinst, struct globalvars_s *pr_globals)
@ -2335,9 +2350,27 @@ void PF_sound (progfuncs_t *prinst, struct globalvars_s *pr_globals)
if (volume < 0) //erm... if (volume < 0) //erm...
return; return;
if (volume > 255)
volume = 255;
SV_StartSound (entity, channel, sample, volume, attenuation); SV_StartSound (entity, channel, sample, volume, attenuation);
} }
//an evil one from telejano.
void PF_LocalSound(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
#ifndef SERVERONLY
sfx_t *sfx;
char * s = PR_GetStringOfs(prinst, OFS_PARM0);
float chan = G_FLOAT(OFS_PARM1);
float vol = G_FLOAT(OFS_PARM2);
if (sfx = S_PrecacheSound(s))
S_StartSound(cl.playernum[0], chan, sfx, cl.simorg[0], vol, 0.0);
#endif
};
/* /*
================= =================
PF_break PF_break
@ -2796,6 +2829,22 @@ void PF_cvar_set (progfuncs_t *prinst, struct globalvars_s *pr_globals)
Cvar_Set (var, val); Cvar_Set (var, val);
} }
void PF_cvar_setf (progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
char *var_name;
float val;
cvar_t *var;
var_name = PR_GetStringOfs(prinst, OFS_PARM0);
val = G_FLOAT(OFS_PARM1);
var = Cvar_FindVar(var_name);
if (!var)
Con_Printf("PF_cvar_set: variable %s not found\n", var_name);
else
Cvar_SetValue (var, val);
}
/* /*
================= =================
PF_registercvar PF_registercvar
@ -4094,13 +4143,10 @@ void PF_WriteString2 (progfuncs_t *prinst, struct globalvars_s *pr_globals)
//====================================================== //======================================================
void PF_tempentity (progfuncs_t *prinst, struct globalvars_s *pr_globals) //copes with any qw point entities.
void SV_point_tempentity (vec3_t o, int type, int count) //count (usually 1) is available for some tent types.
{ {
float *o; int split=0;
int type;
int split=0;
o = G_VECTOR(OFS_PARM0);
type = G_FLOAT(OFS_PARM1);
if (sv.demofile) if (sv.demofile)
return; return;
@ -4111,18 +4157,31 @@ void PF_tempentity (progfuncs_t *prinst, struct globalvars_s *pr_globals)
//this is for lamers with old (or unsupported) clients //this is for lamers with old (or unsupported) clients
MSG_WriteByte (&sv.multicast, svc_temp_entity); MSG_WriteByte (&sv.multicast, svc_temp_entity);
MSG_WriteByte (&sv.nqmulticast, svc_temp_entity);
switch(type) switch(type)
{ {
case TE_BULLET: case TE_BULLET:
MSG_WriteByte (&sv.multicast, TE_SPIKE); MSG_WriteByte (&sv.multicast, TE_SPIKE);
MSG_WriteByte (&sv.nqmulticast, TE_SPIKE);
type = TE_BULLET; type = TE_BULLET;
split = PEXT_TE_BULLET; split = PEXT_TE_BULLET;
break; break;
case TE_SUPERBULLET: case TE_SUPERBULLET:
MSG_WriteByte (&sv.multicast, TE_SUPERSPIKE); MSG_WriteByte (&sv.multicast, TE_SUPERSPIKE);
MSG_WriteByte (&sv.nqmulticast, TE_SUPERSPIKE);
type = TE_SUPERBULLET; type = TE_SUPERBULLET;
split = PEXT_TE_BULLET; split = PEXT_TE_BULLET;
break; break;
case TE_BLOOD:
case TE_GUNSHOT:
MSG_WriteByte (&sv.multicast, type);
MSG_WriteByte (&sv.multicast, count);
MSG_WriteByte (&sv.nqmulticast, type); //nq doesn't have a count.
break;
case TE_LIGHTNING1:
case TE_LIGHTNING2:
case TE_LIGHTNING3:
SV_Error("SV_point_tempentity - type is a beam\n");
default: default:
MSG_WriteByte (&sv.multicast, type); MSG_WriteByte (&sv.multicast, type);
} }
@ -4130,19 +4189,87 @@ void PF_tempentity (progfuncs_t *prinst, struct globalvars_s *pr_globals)
MSG_WriteCoord (&sv.multicast, o[1]); MSG_WriteCoord (&sv.multicast, o[1]);
MSG_WriteCoord (&sv.multicast, o[2]); MSG_WriteCoord (&sv.multicast, o[2]);
SV_MulticastProtExt (o, MULTICAST_PHS, split, 0); MSG_WriteCoord (&sv.nqmulticast, o[0]);
MSG_WriteCoord (&sv.nqmulticast, o[1]);
MSG_WriteCoord (&sv.nqmulticast, o[2]);
if (type == TE_BLOOD || type == TE_LIGHTNINGBLOOD)
{
sv.nqmulticast.cursize = 0; //don't send a te_blood or lightningblood to an nq client - they'll die horribly.
//send a particle instead
MSG_WriteByte (&sv.nqmulticast, svc_particle);
MSG_WriteCoord (&sv.nqmulticast, o[0]);
MSG_WriteCoord (&sv.nqmulticast, o[1]);
MSG_WriteCoord (&sv.nqmulticast, o[2]);
//no direction.
MSG_WriteChar (&sv.nqmulticast, 0);
MSG_WriteChar (&sv.nqmulticast, 0);
MSG_WriteChar (&sv.nqmulticast, 0);
MSG_WriteByte (&sv.nqmulticast, count*20);
if (type == TE_BLOOD)
MSG_WriteByte (&sv.nqmulticast, 73);
else
MSG_WriteByte (&sv.nqmulticast, 225);
}
SV_MulticastProtExt (o, MULTICAST_PHS, pr_global_struct->dimension_send, split, 0);
if (!split) //don't bother sending again. if (!split) //don't bother sending again.
return; return;
//this is for cool people //this is for cool people (not nq users)
MSG_WriteByte (&sv.multicast, svc_temp_entity); MSG_WriteByte (&sv.multicast, svc_temp_entity);
MSG_WriteByte (&sv.multicast, type); MSG_WriteByte (&sv.multicast, type);
MSG_WriteCoord (&sv.multicast, o[0]); MSG_WriteCoord (&sv.multicast, o[0]);
MSG_WriteCoord (&sv.multicast, o[1]); MSG_WriteCoord (&sv.multicast, o[1]);
MSG_WriteCoord (&sv.multicast, o[2]); MSG_WriteCoord (&sv.multicast, o[2]);
SV_MulticastProtExt (o, MULTICAST_PHS, 0, split); SV_MulticastProtExt (o, MULTICAST_PHS, pr_global_struct->dimension_send, 0, split);
}
void SV_beam_tempentity (int ownerent, vec3_t start, vec3_t end, int type)
{
MSG_WriteByte (&sv.multicast, svc_temp_entity);
MSG_WriteByte (&sv.multicast, type);
MSG_WriteShort (&sv.multicast, ownerent);
MSG_WriteCoord (&sv.multicast, start[0]);
MSG_WriteCoord (&sv.multicast, start[1]);
MSG_WriteCoord (&sv.multicast, start[2]);
MSG_WriteCoord (&sv.multicast, end[0]);
MSG_WriteCoord (&sv.multicast, end[1]);
MSG_WriteCoord (&sv.multicast, end[2]);
if (type == TE_LIGHTNING2 && ownerent<0) //special handling for TE_BEAM (don't do TE_RAILGUN - it's a tomaz extension)
{
MSG_WriteByte (&sv.nqmulticast, svc_temp_entity);
MSG_WriteByte (&sv.nqmulticast, NQTE_BEAM);
MSG_WriteShort (&sv.nqmulticast, -1-ownerent);
MSG_WriteCoord (&sv.nqmulticast, start[0]);
MSG_WriteCoord (&sv.nqmulticast, start[1]);
MSG_WriteCoord (&sv.nqmulticast, start[2]);
MSG_WriteCoord (&sv.nqmulticast, end[0]);
MSG_WriteCoord (&sv.nqmulticast, end[1]);
MSG_WriteCoord (&sv.nqmulticast, end[2]);
}
else
{
MSG_WriteByte (&sv.nqmulticast, svc_temp_entity);
MSG_WriteByte (&sv.nqmulticast, type);
MSG_WriteShort (&sv.nqmulticast, ownerent);
MSG_WriteCoord (&sv.nqmulticast, start[0]);
MSG_WriteCoord (&sv.nqmulticast, start[1]);
MSG_WriteCoord (&sv.nqmulticast, start[2]);
MSG_WriteCoord (&sv.nqmulticast, end[0]);
MSG_WriteCoord (&sv.nqmulticast, end[1]);
MSG_WriteCoord (&sv.nqmulticast, end[2]);
}
SV_MulticastProtExt (start, MULTICAST_PHS, pr_global_struct->dimension_send, 0, 0);
}
void PF_tempentity (progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_point_tempentity(G_VECTOR(OFS_PARM0), G_FLOAT(OFS_PARM1), 1);
} }
//============================================================================= //=============================================================================
@ -4421,10 +4548,38 @@ void PF_multicast (progfuncs_t *prinst, struct globalvars_s *pr_globals)
void PF_Fixme (progfuncs_t *prinst, struct globalvars_s *pr_globals) void PF_Fixme (progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ {
progfuncs_t *progfuncs = prinst; progfuncs_t *progfuncs = prinst;
PR_RunError(prinst, "Builtin not implemented.\nYou may need pr_imitatemvdsv to be enabled."); int i;
qboolean printedheader = false;
SV_EndRedirect();
for (i = 0; BuiltinList[i].bifunc; i++)
{
if (BuiltinList[i].ebfsnum == prinst->lastcalledbuiltinnumber)
{
if (!printedheader)
{
Con_Printf("\nMod forgot to ensure support for builtin %i\nPossible builtins:\n", prinst->lastcalledbuiltinnumber);
printedheader = true;
}
Con_Printf("%s\n", BuiltinList[i].name);
}
}
Con_Printf("\n");
if (progstype == PROG_QW)
PR_RunError(prinst, "\nBuiltin %i not implemented.\nMods designed for mvdsv may need pr_imitatemvdsv to be enabled.", prinst->lastcalledbuiltinnumber);
else
PR_RunError(prinst, "\nBuiltin %i not implemented.\nMod is not compatable.", prinst->lastcalledbuiltinnumber);
PR_BIError ("bulitin not implemented"); PR_BIError ("bulitin not implemented");
} }
void PF_Ignore(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
G_INT(OFS_RETURN) = 0;
}
/* /*
============== ==============
PF_logfrag PF_logfrag
@ -4578,7 +4733,7 @@ void PF_substring (progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ {
int i, start, length; int i, start, length;
char *s; char *s;
static char string[1024]; char *string = PF_TempStr();
s = PR_GetStringOfs(prinst, OFS_PARM0); s = PR_GetStringOfs(prinst, OFS_PARM0);
start = G_FLOAT(OFS_PARM1); start = G_FLOAT(OFS_PARM1);
@ -4832,7 +4987,7 @@ typedef struct lh_extension_s {
char *name; char *name;
int numbuiltins; int numbuiltins;
qboolean *enabled; qboolean *enabled;
char *builtins[11]; //extend freely char *builtins[14]; //extend freely
} lh_extension_t; } lh_extension_t;
@ -4881,15 +5036,22 @@ lh_extension_t QSG_Extensions[] = {
{"DP_SV_PLAYERPHYSICS"}, {"DP_SV_PLAYERPHYSICS"},
{"DP_EXTRA_TEMPSTRING"}, //ftos returns 16 temp buffers. {"DP_EXTRA_TEMPSTRING"}, //ftos returns 16 temp buffers.
{"DP_TE_STANDARDEFFECTBUILTINS", 14, NULL, { "te_gunshot", "te_spike", "te_superspike", "te_explosion", "te_tarexplosion",
"te_wizspike", "te_knightspike", "te_lavasplash", "te_teleport", "te_explosion2",
"te_lightning1", "te_lightning2", "te_lightning3", "te_beam"}}, //should we include QW ones?...
{"ZQ_MOVETYPE_NOCLIP"}, {"ZQ_MOVETYPE_NOCLIP"},
{"ZQ_MOVETYPE_FLY"}, {"ZQ_MOVETYPE_FLY"},
{"ZQ_MOVETYPE_NONE"}, {"ZQ_MOVETYPE_NONE"},
{"QSG_DIMENSION_PLANES", 1, NULL, {"bitshift"}},
{"FTE_FORCEINFOKEY", 1, NULL, {"forceinfokey"}}, {"FTE_FORCEINFOKEY", 1, NULL, {"forceinfokey"}},
{"FTE_MULTITHREADED", 3, NULL, {"sleep", "fork", "abort"}}, {"FTE_MULTITHREADED", 3, NULL, {"sleep", "fork", "abort"}},
#ifdef SVCHAT #ifdef SVCHAT
{"FTE_NPCCHAT", 1, NULL, {"chat"}} //server looks at chat files. It automagically branches through calling qc functions as requested. {"FTE_NPCCHAT", 1, NULL, {"chat"}}, //server looks at chat files. It automagically branches through calling qc functions as requested.
#endif #endif
{"DP_SV_SETCOLOR"}
}; };
//some of these are overkill yes, but they are all derived from the fteextensions flags and document the underlaying protocol available. //some of these are overkill yes, but they are all derived from the fteextensions flags and document the underlaying protocol available.
@ -4927,16 +5089,21 @@ lh_extension_t FTE_Protocol_Extensions[] =
{"FTE_PEXT_VWEAP"}, {"FTE_PEXT_VWEAP"},
#ifdef Q2BSPS #ifdef Q2BSPS
{"FTE_PEXT_Q2BSP"}, //supports q2 maps. No bugs are apparent. {"FTE_PEXT_Q2BSP"}, //supports q2 maps. No bugs are apparent.
#else
{NULL},
#endif
#ifdef Q3BSPS
{"FTE_PEXT_Q3BSP"}, //quake3 bsp support. dp probably has an equivelent, but this is queryable per client. {"FTE_PEXT_Q3BSP"}, //quake3 bsp support. dp probably has an equivelent, but this is queryable per client.
#else #else
{NULL}, {NULL},
{NULL},
#endif #endif
{"UDC_EXTEFFECT", 0, &pr_udc_exteffect_enabled}, //hmm. crap. {"UDC_EXTEFFECT", 0, &pr_udc_exteffect_enabled}, //hmm. crap.
{NULL}, {NULL}, //splitscreen - not queryable.
{"FTE_HEXEN2"}, //client can use hexen2 maps. server can use hexen2 progs {"FTE_HEXEN2"}, //client can use hexen2 maps. server can use hexen2 progs
{"FTE_PEXT_SPAWNSTATIC"}, //means that static entities can have alpha/scale and anything else the engine supports on normal ents. (Added for >256 models, while still being compatable - previous system failed with -1 skins) {"FTE_PEXT_SPAWNSTATIC"}, //means that static entities can have alpha/scale and anything else the engine supports on normal ents. (Added for >256 models, while still being compatable - previous system failed with -1 skins)
{"FTE_PEXT_CUSTOMTENTS", 2, NULL, {"RegisterTempEnt", "CustomTempEnt"}} {"FTE_PEXT_CUSTOMTENTS", 2, NULL, {"RegisterTempEnt", "CustomTempEnt"}},
/*not supported yet*/ {"FTE_PEXT_256PACKETENTITIES"}, //client is able to receive unlimited packet entities (server caps itself to 256 to prevent insanity).
{"TEI_SHOWLMP2", 6, NULL, {"showpic", "hidepic", "movepic", "changepic", "showpicent", "hidepicent"}} //telejano doesn't actually export the moveent/changeent (we don't want to either cos it would stop frik_file stuff being autoregistered)
}; };
@ -6066,7 +6233,6 @@ void PF_getstring(progfuncs_t *prinst, struct globalvars_s *pr_globals)
RETURN_PSTRING(s); RETURN_PSTRING(s);
} }
void SV_MulticastProtExt(vec3_t origin, int to, int with, int without);
void PF_RegisterTEnt(progfuncs_t *prinst, struct globalvars_s *pr_globals) void PF_RegisterTEnt(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ {
int arg; int arg;
@ -6135,7 +6301,7 @@ void PF_CustomTEnt(progfuncs_t *prinst, struct globalvars_s *pr_globals)
float *org = G_VECTOR(OFS_PARM1); float *org = G_VECTOR(OFS_PARM1);
if (sv.multicast.cursize) if (sv.multicast.cursize)
SV_MulticastProtExt (org, MULTICAST_PVS, 0, PEXT_CUSTOMTEMPEFFECTS); //do a multicast with the current buffer to all players who won't get the new effect. SV_MulticastProtExt (org, MULTICAST_PVS, pr_global_struct->dimension_send, 0, PEXT_CUSTOMTEMPEFFECTS); //do a multicast with the current buffer to all players who won't get the new effect.
type = G_FLOAT(OFS_PARM0); type = G_FLOAT(OFS_PARM0);
if (type < 0 || type >= 255) if (type < 0 || type >= 255)
@ -6162,7 +6328,7 @@ void PF_CustomTEnt(progfuncs_t *prinst, struct globalvars_s *pr_globals)
if (arg != *prinst->callargc) if (arg != *prinst->callargc)
Con_Printf("PF_CusromTEnt: bad number of arguments for particle type\n"); Con_Printf("PF_CusromTEnt: bad number of arguments for particle type\n");
SV_MulticastProtExt (org, MULTICAST_PVS, PEXT_CUSTOMTEMPEFFECTS, 0); //now send the new multicast to all that will. SV_MulticastProtExt (org, MULTICAST_PVS, pr_global_struct->dimension_send, PEXT_CUSTOMTEMPEFFECTS, 0); //now send the new multicast to all that will.
} }
void PF_Abort(progfuncs_t *prinst, struct globalvars_s *pr_globals) void PF_Abort(progfuncs_t *prinst, struct globalvars_s *pr_globals)
@ -6270,6 +6436,136 @@ void PF_Fork(progfuncs_t *prinst, struct globalvars_s *pr_globals)
} }
//QSG_DIMENSION_PLANES
//helper function
//void(float number, float quantity) bitshift = #218;
void PF_bitshift(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
int bitmask;
int shift;
bitmask = G_FLOAT(OFS_PARM0);
shift = G_FLOAT(OFS_PARM1);
if (shift < 0)
bitmask >>= shift;
else
bitmask <<= shift;
G_FLOAT(OFS_RETURN) = bitmask;
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(vector org) te_gunshot = #418;
void PF_te_gunshot(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
int count;
if (*svprogfuncs->callargc >= 2)
count = G_FLOAT(OFS_PARM1);
else
count = 1;
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_GUNSHOT, count);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(vector org) te_spike = #419;
void PF_te_spike(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_SPIKE, 1);
}
void PF_te_lightningblood(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_LIGHTNINGBLOOD, 1);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(vector org) te_superspike = #420;
void PF_te_superspike(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_SUPERSPIKE, 1);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(vector org) te_explosion = #421;
void PF_te_explosion(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_EXPLOSION, 1);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(vector org) te_tarexplosion = #422;
void PF_te_tarexplosion(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_TAREXPLOSION, 1);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(vector org) te_wizspike = #423;
void PF_te_wizspike(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_WIZSPIKE, 1);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(vector org) te_knightspike = #424;
void PF_te_knightspike(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_KNIGHTSPIKE, 1);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(vector org) te_lavasplash = #425;
void PF_te_lavasplash(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_LAVASPLASH, 1);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(vector org) te_teleport = #426;
void PF_te_teleport(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_TELEPORT, 1);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(vector org, float color) te_explosion2 = #427;
void PF_te_explosion2(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
//FIXME: QW doesn't support TE_EXPLOSION2...
SV_point_tempentity(G_VECTOR(OFS_PARM0), TE_EXPLOSION, 1);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(entity own, vector start, vector end) te_lightning1 = #428;
void PF_te_lightning1(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_beam_tempentity(G_EDICTNUM(prinst, OFS_PARM0), G_VECTOR(OFS_PARM1), G_VECTOR(OFS_PARM2), TE_LIGHTNING1);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(entity own, vector start, vector end) te_lightning2 = #429;
void PF_te_lightning2(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_beam_tempentity(G_EDICTNUM(prinst, OFS_PARM0), G_VECTOR(OFS_PARM1), G_VECTOR(OFS_PARM2), TE_LIGHTNING2);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(entity own, vector start, vector end) te_lightning3 = #430;
void PF_te_lightning3(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_beam_tempentity(G_EDICTNUM(prinst, OFS_PARM0), G_VECTOR(OFS_PARM1), G_VECTOR(OFS_PARM2), TE_LIGHTNING3);
}
//DP_TE_STANDARDEFFECTBUILTINS
//void(entity own, vector start, vector end) te_beam = #431;
void PF_te_beam(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
SV_beam_tempentity(-1 -G_EDICTNUM(prinst, OFS_PARM0), G_VECTOR(OFS_PARM1), G_VECTOR(OFS_PARM2), TE_LIGHTNING2);
}
void PF_ForceInfoKey(progfuncs_t *prinst, struct globalvars_s *pr_globals) void PF_ForceInfoKey(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ {
edict_t *e; edict_t *e;
@ -6307,7 +6603,222 @@ void PF_ForceInfoKey(progfuncs_t *prinst, struct globalvars_s *pr_globals)
Con_DPrintf("PF_ForceInfoKey: not world or client\n"); Con_DPrintf("PF_ForceInfoKey: not world or client\n");
} }
/*
=================
PF_setcolors
sets the color of a client and broadcasts the update to all connected clients
setcolors(clientent, value)
=================
*/
//from lh
void PF_setcolors (progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
client_t *client;
int entnum, i;
char number[8];
entnum = G_EDICTNUM(prinst, OFS_PARM0);
i = G_FLOAT(OFS_PARM1);
if (entnum < 1 || entnum > MAX_CLIENTS)
{
Con_Printf ("tried to setcolor a non-client\n");
return;
}
client = &svs.clients[entnum-1];
client->edict->v.team = (i & 15) + 1;
MSG_WriteByte (&sv.nqreliable_datagram, svc_updatecolors);
MSG_WriteByte (&sv.nqreliable_datagram, entnum - 1);
MSG_WriteByte (&sv.nqreliable_datagram, i);
sprintf(number, "%i", i>>4);
if (!strcmp(number, Info_ValueForKey(client->userinfo, "topcolor")))
{
Info_SetValueForKey(client->userinfo, "topcolor", number, MAX_INFO_STRING);
MSG_WriteByte (&sv.reliable_datagram, svc_setinfo);
MSG_WriteByte (&sv.reliable_datagram, entnum-1);
MSG_WriteString (&sv.reliable_datagram, "topcolor");
MSG_WriteString (&sv.reliable_datagram, number);
}
sprintf(number, "%i", i&15);
if (!strcmp(number, Info_ValueForKey(client->userinfo, "bottomcolor")))
{
Info_SetValueForKey(client->userinfo, "bottomcolor", number, MAX_INFO_STRING);
MSG_WriteByte (&sv.reliable_datagram, svc_setinfo);
MSG_WriteByte (&sv.reliable_datagram, entnum-1);
MSG_WriteString (&sv.reliable_datagram, "bottomcolor");
MSG_WriteString (&sv.reliable_datagram, number);
}
SV_ExtractFromUserinfo (client);
}
static void ParamNegateFix ( float * xx, float * yy, int Zone )
{
float x,y;
x = xx[0];
y = yy[0];
if (Zone == SL_ORG_CC || SL_ORG_CW == Zone || SL_ORG_CE == Zone )
y = y + 8000;
if (Zone == SL_ORG_CC || SL_ORG_CN == Zone || SL_ORG_CS == Zone )
x = x + 8000;
xx[0] = x;
yy[0] = y;
}
void PF_ShowPic(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
progfuncs_t *progfuncs = prinst;
char *slot = PR_GetStringOfs(prinst, OFS_PARM0);
char *picname = PR_GetStringOfs(prinst, OFS_PARM1);
float x = G_FLOAT(OFS_PARM2);
float y = G_FLOAT(OFS_PARM3);
float zone = G_FLOAT(OFS_PARM4);
int entnum;
ParamNegateFix( &x, &y, zone );
if (*prinst->callargc==6)
{ //to a single client
entnum = G_EDICTNUM(prinst, OFS_PARM5)-1;
if (entnum < 0 || entnum >= sv.allocated_client_slots)
PR_RunError (prinst, "WriteDest: not a client");
if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC))
return; //need an extension for this. duh.
ClientReliableWrite_Begin(&svs.clients[entnum], svc_showpic, 8 + strlen(slot)+strlen(picname));
ClientReliableWrite_Byte(&svs.clients[entnum], zone);
ClientReliableWrite_String(&svs.clients[entnum], slot);
ClientReliableWrite_String(&svs.clients[entnum], picname);
ClientReliableWrite_Short(&svs.clients[entnum], x);
ClientReliableWrite_Short(&svs.clients[entnum], y);
}
else
{
//multicast instead of broadcast - 1: selective on the extensions. 2: reliable. 3: cleaner.
MSG_WriteByte (&sv.multicast, svc_showpic);
MSG_WriteByte (&sv.multicast, zone);//zone
MSG_WriteString(&sv.multicast, slot);//label
MSG_WriteString(&sv.multicast, picname);//picname
MSG_WriteShort (&sv.multicast, x);
MSG_WriteShort (&sv.multicast, y);
SV_MulticastProtExt(vec3_origin, MULTICAST_ALL_R, FULLDIMENSIONMASK, PEXT_SHOWPIC, 0);
}
};
void PF_HidePic(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
progfuncs_t *progfuncs = prinst;
char *slot = PR_GetStringOfs(prinst, OFS_PARM0);
int entnum;
if (*prinst->callargc==2)
{ //to a single client
entnum = G_EDICTNUM(prinst, OFS_PARM1)-1;
if (entnum < 0 || entnum >= sv.allocated_client_slots)
PR_RunError (prinst, "WriteDest: not a client");
if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC))
return; //need an extension for this. duh.
ClientReliableWrite_Begin(&svs.clients[entnum], svc_hidepic, 2 + strlen(slot));
ClientReliableWrite_String(&svs.clients[entnum], slot);
}
else
{
//easier to multicast
MSG_WriteByte (&sv.multicast, svc_hidepic);
MSG_WriteString(&sv.multicast, slot);//lmp label
SV_MulticastProtExt(vec3_origin, MULTICAST_ALL_R, FULLDIMENSIONMASK, PEXT_SHOWPIC, 0);
}
};
void PF_MovePic(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
progfuncs_t *progfuncs = prinst;
char *slot = PR_GetStringOfs(prinst, OFS_PARM0);
float x = G_FLOAT(OFS_PARM1);
float y = G_FLOAT(OFS_PARM2);
float zone = G_FLOAT(OFS_PARM3);
int entnum;
ParamNegateFix( &x, &y, zone );
if (*prinst->callargc==5)
{ //to a single client
entnum = G_EDICTNUM(prinst, OFS_PARM4)-1;
if (entnum < 0 || entnum >= sv.allocated_client_slots)
PR_RunError (prinst, "WriteDest: not a client");
if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC))
return; //need an extension for this. duh.
ClientReliableWrite_Begin(&svs.clients[entnum], svc_movepic, 6 + strlen(slot));
ClientReliableWrite_String(&svs.clients[entnum], slot);
ClientReliableWrite_Byte(&svs.clients[entnum], zone);
ClientReliableWrite_Short(&svs.clients[entnum], x);
ClientReliableWrite_Short(&svs.clients[entnum], y);
}
else
{
//easier to multicast
MSG_WriteByte (&sv.multicast, svc_movepic);
MSG_WriteString(&sv.multicast, slot);//lmp label
MSG_WriteByte (&sv.multicast, zone);
MSG_WriteShort (&sv.multicast, x);
MSG_WriteShort (&sv.multicast, y);
SV_MulticastProtExt(vec3_origin, MULTICAST_ALL_R, FULLDIMENSIONMASK, PEXT_SHOWPIC, 0);
}
};
void PF_ChangePic(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
progfuncs_t *progfuncs = prinst;
char *slot = PR_GetStringOfs(prinst, OFS_PARM0);
char *newpic= PR_GetStringOfs(prinst, OFS_PARM1);
int entnum;
if (*prinst->callargc==3)
{ //to a single client
entnum = G_EDICTNUM(prinst, OFS_PARM2)-1;
if (entnum < 0 || entnum >= sv.allocated_client_slots)
PR_RunError (prinst, "WriteDest: not a client");
if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC))
return; //need an extension for this. duh.
ClientReliableWrite_Begin(&svs.clients[entnum], svc_updatepic, 3 + strlen(slot)+strlen(newpic));
ClientReliableWrite_String(&svs.clients[entnum], slot);
ClientReliableWrite_String(&svs.clients[entnum], newpic);
}
else
{
MSG_WriteByte (&sv.multicast, svc_updatepic);
MSG_WriteString(&sv.multicast, slot);
MSG_WriteString(&sv.multicast, newpic);
SV_MulticastProtExt(vec3_origin, MULTICAST_ALL_R, FULLDIMENSIONMASK, PEXT_SHOWPIC, 0);
}
}
BuiltinList_t BuiltinList[] = { //nq qw h2 ebfs BuiltinList_t BuiltinList[] = { //nq qw h2 ebfs
{"fixme", PF_Fixme, 0, 0, 0},
{"ignore", PF_Ignore, 0, 0, 0},
{"makevectors", PF_makevectors, 1, 1, 1}, // void(entity e) makevectors = #1; {"makevectors", PF_makevectors, 1, 1, 1}, // void(entity e) makevectors = #1;
{"setorigin", PF_setorigin, 2, 2, 2}, // void(entity e, vector o) setorigin = #2; {"setorigin", PF_setorigin, 2, 2, 2}, // void(entity e, vector o) setorigin = #2;
{"setmodel", PF_setmodel, 3, 3, 3}, // void(entity e, string m) setmodel = #3; {"setmodel", PF_setmodel, 3, 3, 3}, // void(entity e, string m) setmodel = #3;
@ -6409,12 +6920,32 @@ BuiltinList_t BuiltinList[] = { //nq qw h2 ebfs
{"setspawnparms", PF_setspawnparms, 78, 78, 78}, //78 {"setspawnparms", PF_setspawnparms, 78, 78, 78}, //78
{"plaque_draw", PF_plaque_draw, 0, 0, 79}, //79 {"plaque_draw", PF_plaque_draw, 0, 0, 79}, //79
{"logfrag", PF_logfrag, 0, 79, 0}, //79 {"logfrag", PF_logfrag, 0, 79, 0}, //79
{"rain_go", PF_rain_go, 0, 0, 80}, //79
// Tomaz - QuakeC String Manipulation Begin
{"tq_zone", PF_dupstring, 0, 0, 0, 79}, //79
{"tq_unzone", PF_forgetstring, 0, 0, 0, 80}, //80
//stof
{"tq_strcat", PF_strcat, 0, 0, 0, 82}, //82
{"tq_substring", PF_substring, 0, 0, 0, 83}, //83
{"tq_stof", PF_stof, 0, 0, 0, 84}, //84
{"tq_stov", PF_stov, 0, 0, 0, 85}, //85
// Tomaz - QuakeC String Manipulation End
// Tomaz - QuakeC File System Begin (new mods use frik_file instead)
{"tq_fopen", PF_fopen, 0, 0, 0, 86},// #86 float(string filename, float mode) fopen (QSG_FILE)
{"tq_fclose", PF_fclose, 0, 0, 0, 87},// #87 void(float fhandle) fclose (QSG_FILE)
{"tq_fgets", PF_fgets, 0, 0, 0, 88},// #88 string(float fhandle) fgets (QSG_FILE)
{"tq_fputs", PF_fputs, 0, 0, 0, 89},// #89 void(float fhandle, string s) fputs (QSG_FILE)
// Tomaz - QuakeC File System End
{"rain_go", PF_rain_go, 0, 0, 80}, //80
{"infokey", PF_infokey, 0, 80, 0, 80}, //80 {"infokey", PF_infokey, 0, 80, 0, 80}, //80
{"stof", PF_stof, 0, 81, 0, 81}, //81 {"stof", PF_stof, 0, 81, 0, 81}, //81
{"multicast", PF_multicast, 0, 82, 0, 0}, //82 {"multicast", PF_multicast, 0, 82, 0, 0}, //82
//mvdsv (don't require ebfs usage in qw) //mvdsv (don't require ebfs usage in qw)
{"executecommand", PF_ExecuteCommand, 0, 83, 0, 83}, //83 //void() exec; please don't use. {"executecommand", PF_ExecuteCommand, 0, 83, 0, 83}, //83 //void() exec; please don't use.
{"mvdtokenize", PF_Tokenize, 0, 84, 0, 84}, //84 //void(string str) tokanize; {"mvdtokenize", PF_Tokenize, 0, 84, 0, 84}, //84 //void(string str) tokanize;
@ -6473,6 +7004,8 @@ BuiltinList_t BuiltinList[] = { //nq qw h2 ebfs
{"max", PF_max, 0, 0, 0, 95}, // #95 float(float a, floats) max (DP_QC_MINMAXBOUND) {"max", PF_max, 0, 0, 0, 95}, // #95 float(float a, floats) max (DP_QC_MINMAXBOUND)
{"bound", PF_bound, 0, 0, 0, 96}, // #96 float(float minimum, float val, float maximum) bound (DP_QC_MINMAXBOUND) {"bound", PF_bound, 0, 0, 0, 96}, // #96 float(float minimum, float val, float maximum) bound (DP_QC_MINMAXBOUND)
{"pow", PF_pow, 0, 0, 0, 97}, {"pow", PF_pow, 0, 0, 0, 97},
{"tj_cvar_string", PF_cvar_string, 0, 0, 0, 97}, //telejano
//DP_QC_FINDFLOAT
{"findfloat", PF_FindFloat, 0, 0, 0, 98}, // #98 entity(entity start, float fld, float match) findfloat (DP_QC_FINDFLOAT) {"findfloat", PF_FindFloat, 0, 0, 0, 98}, // #98 entity(entity start, float fld, float match) findfloat (DP_QC_FINDFLOAT)
{"checkextension", PF_checkextension, 99, 99, 0, 99}, // #99 //darkplaces system - query a string to see if the mod supports X Y and Z. {"checkextension", PF_checkextension, 99, 99, 0, 99}, // #99 //darkplaces system - query a string to see if the mod supports X Y and Z.
@ -6480,6 +7013,15 @@ BuiltinList_t BuiltinList[] = { //nq qw h2 ebfs
{"anglemod", PF_anglemod, 0, 0, 0, 102}, {"anglemod", PF_anglemod, 0, 0, 0, 102},
{"cvar_string", PF_cvar_string, 0, 0, 0, 103}, {"cvar_string", PF_cvar_string, 0, 0, 0, 103},
//TEI_SHOWLMP2
{"showpic", PF_ShowPic, 0, 0, 0, 104},
{"hidepic", PF_HidePic, 0, 0, 0, 105},
{"movepic", PF_MovePic, 0, 0, 0, 106},
{"changepic", PF_ChangePic, 0, 0, 0, 107},
{"showpicent", PF_ShowPic, 0, 0, 0, 108},
{"hidepicent", PF_HidePic, 0, 0, 0, 109},
//End TEU_SHOWLMP2
//frik file //frik file
{"fopen", PF_fopen, 0, 0, 0, 110},// #110 float(string filename, float mode) fopen (FRIK_FILE) {"fopen", PF_fopen, 0, 0, 0, 110},// #110 float(string filename, float mode) fopen (FRIK_FILE)
{"fclose", PF_fclose, 0, 0, 0, 111},// #111 void(float fhandle) fclose (FRIK_FILE) {"fclose", PF_fclose, 0, 0, 0, 111},// #111 void(float fhandle) fclose (FRIK_FILE)
@ -6493,6 +7035,11 @@ BuiltinList_t BuiltinList[] = { //nq qw h2 ebfs
{"strunzone", PF_forgetstring, 0, 0, 0, 119},// #119 string(string s) strunzone (FRIK_FILE) {"strunzone", PF_forgetstring, 0, 0, 0, 119},// #119 string(string s) strunzone (FRIK_FILE)
//end frikfile //end frikfile
//these are telejano's
{"cvar_setf", PF_cvar_setf, 0, 0, 0, 176},// #176 void(string cvar, float val) cvar_setf
{"localsound", PF_LocalSound, 0, 0, 0, 177},// #177
//end telejano
//fte extras //fte extras
{"getmodelindex", PF_WeapIndex, 0, 0, 0, 200}, {"getmodelindex", PF_WeapIndex, 0, 0, 0, 200},
{"externcall", PF_externcall, 0, 0, 0, 201}, {"externcall", PF_externcall, 0, 0, 0, 201},
@ -6514,18 +7061,46 @@ BuiltinList_t BuiltinList[] = { //nq qw h2 ebfs
#ifdef SVCHAT #ifdef SVCHAT
{"chat", PF_chat, 0, 0, 0, 214},// #214 void(string filename, float starttag, entity edict) SV_Chat (FTE_NPCCHAT) {"chat", PF_chat, 0, 0, 0, 214},// #214 void(string filename, float starttag, entity edict) SV_Chat (FTE_NPCCHAT)
#endif #endif
//FTE_PEXT_HEXEN2
{"particle2", PF_particle2, 0, 0, 42, 215}, {"particle2", PF_particle2, 0, 0, 42, 215},
{"particle3", PF_particle3, 0, 0, 85, 216}, {"particle3", PF_particle3, 0, 0, 85, 216},
{"particle4", PF_particle4, 0, 0, 86, 217}, {"particle4", PF_particle4, 0, 0, 86, 217},
//QSG_DIMENSION_PLANES
{"bitshift", PF_bitshift, 0, 0, 0, 218},
//I guess this should go under DP_TE_STANDARDEFFECTBUILTINS...
{"te_lightningblood",PF_te_lightningblood, 0, 0, 0, 219},// #219 te_lightningblood
//end fte extras //end fte extras
//other peoples extras //DP extras
//DP_QC_COPYENTITY
{"copyentity", PF_copyentity, 0, 0, 0, 400},// #400 void(entity from, entity to) copyentity (DP_QC_COPYENTITY) {"copyentity", PF_copyentity, 0, 0, 0, 400},// #400 void(entity from, entity to) copyentity (DP_QC_COPYENTITY)
//DP_SV_SETCOLOR
{"setcolors", PF_setcolors, 0, 0, 0, 401},// #401 void(entity from, entity to) setcolors
//DP_QC_FINDCHAIN
{"findchain", PF_findchain, 0, 0, 0, 402},// #402 entity(string field, string match) findchain (DP_QC_FINDCHAIN) {"findchain", PF_findchain, 0, 0, 0, 402},// #402 entity(string field, string match) findchain (DP_QC_FINDCHAIN)
//DP_QC_FINDCHAINFLOAT
{"findfloatchain", PF_findchainfloat, 0, 0, 0, 403},// #403 entity(float fld, float match) findchainfloat (DP_QC_FINDCHAINFLOAT) {"findfloatchain", PF_findchainfloat, 0, 0, 0, 403},// #403 entity(float fld, float match) findchainfloat (DP_QC_FINDCHAINFLOAT)
{"te_blood", PF_te_blood, 0, 0, 0, 405},// #405 te_blood {"te_blood", PF_te_blood, 0, 0, 0, 405},// #405 te_blood
//DP_TE_STANDARDEFFECTBUILTINS
{"te_gunshot", PF_te_gunshot, 0, 0, 0, 418},// #418 te_gunshot
{"te_spike", PF_te_spike, 0, 0, 0, 419},// #419 te_spike
{"te_superspike", PF_te_superspike, 0, 0, 0, 420},// #420 te_superspike
{"te_explosion", PF_te_explosion, 0, 0, 0, 421},// #421 te_explosion
{"te_tarexplosion", PF_te_tarexplosion, 0, 0, 0, 422},// #422 te_tarexplosion
{"te_wizspike", PF_te_wizspike, 0, 0, 0, 423},// #423 te_wizspike
{"te_knightspike", PF_te_knightspike, 0, 0, 0, 424},// #424 te_knightspike
{"te_lavasplash", PF_te_lavasplash, 0, 0, 0, 425},// #425 te_lavasplash
{"te_teleport", PF_te_teleport, 0, 0, 0, 426},// #426 te_teleport
{"te_explosion2", PF_te_explosion2, 0, 0, 0, 427},// #427 te_explosion2
{"te_lightning1", PF_te_lightning1, 0, 0, 0, 428},// #428 te_lightning1
{"te_lightning2", PF_te_lightning2, 0, 0, 0, 429},// #429 te_lightning2
{"te_lightning3", PF_te_lightning3, 0, 0, 0, 430},// #430 te_lightning3
{"te_beam", PF_te_beam, 0, 0, 0, 431},// #431 te_beam
//DP_QC_VECTORVECTORS
{"vectorvectors", PF_vectorvectors, 0, 0, 0, 432},// #432 void(vector dir) vectorvectors (DP_QC_VECTORVECTORS) {"vectorvectors", PF_vectorvectors, 0, 0, 0, 432},// #432 void(vector dir) vectorvectors (DP_QC_VECTORVECTORS)
//KRIMZON_SV_PARSECLIENTCOMMAND
{"clientcommand", PF_clientcommand, 0, 0, 0, 440},// #440 void(entity e, string s) clientcommand (KRIMZON_SV_PARSECLIENTCOMMAND) {"clientcommand", PF_clientcommand, 0, 0, 0, 440},// #440 void(entity e, string s) clientcommand (KRIMZON_SV_PARSECLIENTCOMMAND)
{"tokenize", PF_Tokenize, 0, 0, 0, 441},// #441 float(string s) tokenize (KRIMZON_SV_PARSECLIENTCOMMAND) {"tokenize", PF_Tokenize, 0, 0, 0, 441},// #441 float(string s) tokenize (KRIMZON_SV_PARSECLIENTCOMMAND)
{"argv", PF_ArgV, 0, 0, 0, 442},// #442 string(float n) argv (KRIMZON_SV_PARSECLIENTCOMMAND {"argv", PF_ArgV, 0, 0, 0, 442},// #442 string(float n) argv (KRIMZON_SV_PARSECLIENTCOMMAND
@ -6542,7 +7117,6 @@ void PR_ResetBuiltins(progstype_t type) //fix all nulls to PF_FIXME and add any
int builtincount[sizeof(pr_builtin)/sizeof(pr_builtin[0])]; int builtincount[sizeof(pr_builtin)/sizeof(pr_builtin[0])];
memset(pr_builtin, 0, sizeof(pr_builtin)); memset(pr_builtin, 0, sizeof(pr_builtin));
memset(builtincount, 0, sizeof(builtincount));
if (type == PROG_QW) if (type == PROG_QW)
{ {
@ -6581,6 +7155,7 @@ void PR_ResetBuiltins(progstype_t type) //fix all nulls to PF_FIXME and add any
} }
} }
memset(builtincount, 0, sizeof(builtincount));
for (i = 0; i < pr_numbuiltins; i++) //clean up nulls for (i = 0; i < pr_numbuiltins; i++) //clean up nulls
{ {
@ -6592,24 +7167,53 @@ void PR_ResetBuiltins(progstype_t type) //fix all nulls to PF_FIXME and add any
builtincount[i]=100; builtincount[i]=100;
} }
for (i = 0; BuiltinList[i].name; i++) if (!pr_compatabilitytest.value)
{ {
builtincount[BuiltinList[i].ebfsnum]++; for (i = 0; BuiltinList[i].name; i++)
}
for (i = 0; BuiltinList[i].name; i++)
{
if (BuiltinList[i].ebfsnum)
{ {
if (builtincount[BuiltinList[i].ebfsnum] == 1) builtincount[BuiltinList[i].ebfsnum]++;
}
for (i = 0; BuiltinList[i].name; i++)
{
if (BuiltinList[i].ebfsnum)
{ {
pr_builtin[BuiltinList[i].ebfsnum] = BuiltinList[i].bifunc; if (pr_builtin[BuiltinList[i].ebfsnum] == PF_Fixme && builtincount[BuiltinList[i].ebfsnum] == 1)
Con_DPrintf("Enabled %s\n", BuiltinList[i].name); {
pr_builtin[BuiltinList[i].ebfsnum] = BuiltinList[i].bifunc;
Con_DPrintf("Enabled %s\n", BuiltinList[i].name);
}
else if (pr_builtin[i] != BuiltinList[i].bifunc)
Con_DPrintf("Not enabled %s\n", BuiltinList[i].name);
} }
else if (pr_builtin[i] != BuiltinList[i].bifunc)
Con_DPrintf("Not enabled %s\n", BuiltinList[i].name);
} }
} }
{
char *builtinmap;
int binum;
builtinmap = COM_LoadTempFile("fte_bimap.txt");
while(1)
{
builtinmap = COM_Parse(builtinmap);
if (!builtinmap)
break;
binum = atoi(com_token);
builtinmap = COM_Parse(builtinmap);
for (i = 0; BuiltinList[i].name; i++)
{
if (!strcmp(BuiltinList[i].name, com_token))
{
pr_builtin[binum] = BuiltinList[i].bifunc;
break;
}
}
if (!BuiltinList[i].name)
Con_Printf("Failed to map builtin %s to %i specified in fte_bimap.dat\n");
}
}
for (i = 0; i < sizeof(QSG_Extensions)/sizeof(QSG_Extensions[0]); i++) for (i = 0; i < sizeof(QSG_Extensions)/sizeof(QSG_Extensions[0]); i++)
{ {
if (QSG_Extensions[i].enabled) if (QSG_Extensions[i].enabled)
@ -6858,6 +7462,11 @@ void PR_RegisterFields(void) //it's just easier to do it this way.
fieldentity(movechain); fieldentity(movechain);
fieldfunction(chainmoved); fieldfunction(chainmoved);
//QSG_DIMENSION_PLANES
fieldfloat(dimension_mask);
fieldfloat(dimension_ghost);
fieldfloat(dimension_physics);
if (pr_fixbrokenqccarrays.value) if (pr_fixbrokenqccarrays.value)
QC_RegisterFieldVar(svprogfuncs, 0, NULL, 0,0); QC_RegisterFieldVar(svprogfuncs, 0, NULL, 0,0);
} }

5
engine/server/server.h
View file

@ -269,7 +269,7 @@ typedef struct {
qbyte *buffer[MAXCACHEDSOUNDBUFFERS]; qbyte *buffer[MAXCACHEDSOUNDBUFFERS];
} svvoicechat_t; } svvoicechat_t;
#define MAX_BACK_BUFFERS 8 #define MAX_BACK_BUFFERS 16
enum seef_e{ enum seef_e{
SEEF_BRIGHTFIELD, SEEF_BRIGHTFIELD,
@ -837,7 +837,8 @@ void SV_SetMoveVars(void);
void SV_SendClientMessages (void); void SV_SendClientMessages (void);
void SV_Multicast (vec3_t origin, multicast_t to); void SV_Multicast (vec3_t origin, multicast_t to);
void SV_MulticastProtExt(vec3_t origin, int to, int with, int without); #define FULLDIMENSIONMASK 0xffffffff
void SV_MulticastProtExt(vec3_t origin, multicast_t to, int dimension_mask, int with, int without);
void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, void SV_StartSound (edict_t *entity, int channel, char *sample, int volume,
float attenuation); float attenuation);

24
engine/server/sv_ents.c
View file

@ -546,7 +546,7 @@ int SV_HullNumForPlayer(int h2hull, float *mins, float *maxs)
return size[2]; //clients are expected to decide themselves. return size[2]; //clients are expected to decide themselves.
} }
if (progstype == PROG_H2 && h2hull) if (h2hull)
return h2hull-1; return h2hull-1;
@ -690,7 +690,10 @@ void SV_WritePlayerToClient(sizebuf_t *msg, clstate_t *ent)
{ {
if (ent->cl) if (ent->cl)
{ {
pm_type = SV_PMTypeForClient (ent->cl); if (ent->cl->viewent)
pm_type = PMC_NONE;
else
pm_type = SV_PMTypeForClient (ent->cl);
switch (pm_type) switch (pm_type)
{ {
case PM_NORMAL: // Z_EXT_PM_TYPE protocol extension case PM_NORMAL: // Z_EXT_PM_TYPE protocol extension
@ -1253,6 +1256,9 @@ void SV_WritePlayersToClient (client_t *client, edict_t *clent, qbyte *pvs, size
{ {
continue; // not visible continue; // not visible
} }
if (!((int)clent->v.dimension_mask & ((int)ent->v.dimension_mask | (int)ent->v.dimension_ghost)))
continue; //not in this dimension - sorry...
} }
{ {
@ -1281,6 +1287,12 @@ void SV_WritePlayersToClient (client_t *client, edict_t *clent, qbyte *pvs, size
clst.maxs = vent->v.maxs; clst.maxs = vent->v.maxs;
clst.scale = vent->v.scale; clst.scale = vent->v.scale;
clst.transparency = vent->v.alpha; clst.transparency = vent->v.alpha;
//QSG_DIMENSION_PLANES - if the only shared dimensions are ghost dimensions, Set half alpha.
if (((int)clent->v.dimension_mask & (int)ent->v.dimension_ghost))
if (!((int)clent->v.dimension_mask & ((int)ent->v.dimension_mask & ~(int)ent->v.dimension_ghost)) )
clst.transparency /= 2;
clst.fatness = vent->v.fatness; clst.fatness = vent->v.fatness;
clst.localtime = cl->localtime; clst.localtime = cl->localtime;
clst.health = ent->v.health; clst.health = ent->v.health;
@ -1945,6 +1957,9 @@ void SV_WriteEntitiesToClient (client_t *client, sizebuf_t *msg, qboolean ignore
if (ent->v.drawonlytoclient) if (ent->v.drawonlytoclient)
if (ent->v.drawonlytoclient != EDICT_TO_PROG(svprogfuncs, client->edict)) if (ent->v.drawonlytoclient != EDICT_TO_PROG(svprogfuncs, client->edict))
continue; continue;
if (!((int)client->edict->v.dimension_mask & ((int)ent->v.dimension_mask | (int)ent->v.dimension_ghost)))
continue; //not in this dimension - sorry...
#ifdef NQPROT #ifdef NQPROT
if (nqprot) if (nqprot)
{ {
@ -2062,6 +2077,11 @@ void SV_WriteEntitiesToClient (client_t *client, sizebuf_t *msg, qboolean ignore
state->trans = ent->v.alpha; state->trans = ent->v.alpha;
if (!state->trans) if (!state->trans)
state->trans = 1; state->trans = 1;
//QSG_DIMENSION_PLANES - if the only shared dimensions are ghost dimensions, Set half alpha.
if (((int)client->edict->v.dimension_mask & (int)ent->v.dimension_ghost))
if (!((int)client->edict->v.dimension_mask & ((int)ent->v.dimension_mask & ~(int)ent->v.dimension_ghost)) )
state->trans /= 2;
#endif #endif
#ifdef PEXT_FATNESS #ifdef PEXT_FATNESS
state->fatness = ent->v.fatness; state->fatness = ent->v.fatness;

2
engine/server/sv_main.c
View file

@ -2974,6 +2974,8 @@ void SV_InitLocal (void)
svs.fteprotocolextensions |= PEXT_SPAWNSTATIC2; svs.fteprotocolextensions |= PEXT_SPAWNSTATIC2;
svs.fteprotocolextensions |= PEXT_CUSTOMTEMPEFFECTS; svs.fteprotocolextensions |= PEXT_CUSTOMTEMPEFFECTS;
svs.fteprotocolextensions |= PEXT_256PACKETENTITIES; svs.fteprotocolextensions |= PEXT_256PACKETENTITIES;
// svs.fteprotocolextensions |= PEXT_64PLAYERS;
svs.fteprotocolextensions |= PEXT_SHOWPIC;
// if (svs.protocolextensions) // if (svs.protocolextensions)
// Info_SetValueForStarKey (svs.info, "*"DISTRIBUTION"_ext", va("%x", svs.protocolextensions), MAX_SERVERINFO_STRING); // Info_SetValueForStarKey (svs.info, "*"DISTRIBUTION"_ext", va("%x", svs.protocolextensions), MAX_SERVERINFO_STRING);

25
engine/server/sv_send.c
View file

@ -430,7 +430,7 @@ MULTICAST_PVS send to clients potentially visible from org
MULTICAST_PHS send to clients potentially hearable from org MULTICAST_PHS send to clients potentially hearable from org
================= =================
*/ */
void SV_MulticastProtExt(vec3_t origin, int to, int with, int without) void SV_MulticastProtExt(vec3_t origin, multicast_t to, int dimension_mask, int with, int without)
{ {
client_t *client; client_t *client;
qbyte *mask; qbyte *mask;
@ -596,6 +596,10 @@ void SV_MulticastProtExt(vec3_t origin, int to, int with, int without)
continue; continue;
} }
if (svprogfuncs)
if (!(dimension_mask & (int)client->edict->v.dimension_mask))
continue;
if (to == MULTICAST_PHS_R || to == MULTICAST_PHS) { if (to == MULTICAST_PHS_R || to == MULTICAST_PHS) {
vec3_t delta; vec3_t delta;
VectorSubtract(origin, client->edict->v.origin, delta); VectorSubtract(origin, client->edict->v.origin, delta);
@ -656,7 +660,7 @@ void SV_MulticastProtExt(vec3_t origin, int to, int with, int without)
//version does all the work now //version does all the work now
void SV_Multicast (vec3_t origin, multicast_t to) void SV_Multicast (vec3_t origin, multicast_t to)
{ {
SV_MulticastProtExt(origin, to, 0, 0); SV_MulticastProtExt(origin, to, FULLDIMENSIONMASK, 0, 0);
} }
/* /*
@ -777,9 +781,9 @@ void SV_StartSound (edict_t *entity, int channel, char *sample, int volume,
MSG_WriteCoord (&sv.nqmulticast, origin[i]); MSG_WriteCoord (&sv.nqmulticast, origin[i]);
#endif #endif
if (use_phs) if (use_phs)
SV_Multicast (origin, reliable ? MULTICAST_PHS_R : MULTICAST_PHS); SV_MulticastProtExt(origin, reliable ? MULTICAST_PHS_R : MULTICAST_PHS, entity->v.dimension_mask, 0, 0);
else else
SV_Multicast (origin, reliable ? MULTICAST_ALL_R : MULTICAST_ALL); SV_MulticastProtExt(origin, reliable ? MULTICAST_ALL_R : MULTICAST_ALL, entity->v.dimension_mask, 0, 0);
} }
/* /*
@ -1379,7 +1383,18 @@ void SV_UpdateToReliableMessages (void)
newval = 1; newval = 1;
} }
if (host_client->entgravity != newval) /* if (host_client->viewent)
{
#define VIEWENT_GRAVITY_MAGIC 0.83217 //we use so the gravity is properly reset when viewent is cleared
if (host_client->entgravity != newval+VIEWENT_GRAVITY_MAGIC)
{
ClientReliableWrite_Begin(host_client, svc_entgravity, 5);
ClientReliableWrite_Float(host_client, 0);
host_client->entgravity = newval+VIEWENT_GRAVITY_MAGIC;
}
#undef VIEWENT_GRAVITY_MAGIC
}
else */if (host_client->entgravity != newval)
{ {
ClientReliableWrite_Begin(host_client, svc_entgravity, 5); ClientReliableWrite_Begin(host_client, svc_entgravity, 5);
ClientReliableWrite_Float(host_client, newval); ClientReliableWrite_Float(host_client, newval);

12
engine/server/sv_user.c
View file

@ -59,6 +59,7 @@ cvar_t votetime = {"votetime", "10"};
cvar_t pr_allowbutton1 = {"pr_allowbutton1", "1", NULL, CVAR_LATCH}; cvar_t pr_allowbutton1 = {"pr_allowbutton1", "1", NULL, CVAR_LATCH};
extern cvar_t pm_bunnyspeedcap; extern cvar_t pm_bunnyspeedcap;
extern cvar_t pm_ktjump; extern cvar_t pm_ktjump;
extern cvar_t pm_slidefix; extern cvar_t pm_slidefix;
@ -964,6 +965,7 @@ void SV_Spawn_f (void)
else else
{ {
memset (&ent->v, 0, pr_edict_size-svprogparms.edictsize); memset (&ent->v, 0, pr_edict_size-svprogparms.edictsize);
ED_Spawned(ent);
ent->v.colormap = NUM_FOR_EDICT(svprogfuncs, ent); ent->v.colormap = NUM_FOR_EDICT(svprogfuncs, ent);
ent->v.team = 0; // FIXME ent->v.team = 0; // FIXME
ent->v.netname = PR_SetString(svprogfuncs, split->name); ent->v.netname = PR_SetString(svprogfuncs, split->name);
@ -2728,6 +2730,7 @@ void SVNQ_Spawn_f (void)
else else
{ {
memset (&ent->v, 0, pr_edict_size-svprogparms.edictsize); memset (&ent->v, 0, pr_edict_size-svprogparms.edictsize);
ED_Spawned(ent);
ent->v.colormap = NUM_FOR_EDICT(svprogfuncs, ent); ent->v.colormap = NUM_FOR_EDICT(svprogfuncs, ent);
ent->v.team = 0; // FIXME ent->v.team = 0; // FIXME
@ -3203,6 +3206,8 @@ vec3_t offset;
break; break;
if (i != 3) if (i != 3)
continue; continue;
if (!((int)sv_player->v.dimension_physics & (int)check->v.dimension_physics))
continue;
if (pmove.numphysent == MAX_PHYSENTS) if (pmove.numphysent == MAX_PHYSENTS)
break; break;
pe = &pmove.physents[pmove.numphysent]; pe = &pmove.physents[pmove.numphysent];
@ -3238,6 +3243,9 @@ vec3_t offset;
if (i != 3) if (i != 3)
continue; continue;
if (!((int)sv_player->v.dimension_physics & (int)check->v.dimension_physics))
continue;
// sv_player->v.origin // sv_player->v.origin
// check->v.model = "a"; // check->v.model = "a";
os = check->v.solid; os = check->v.solid;
@ -4529,14 +4537,14 @@ void SV_ClientThink (void)
sv_player->v.movement[1] = cmd.sidemove * host_frametime; sv_player->v.movement[1] = cmd.sidemove * host_frametime;
sv_player->v.movement[2] = cmd.upmove * host_frametime; sv_player->v.movement[2] = cmd.upmove * host_frametime;
if (SV_PlayerPhysicsQC) /* if (SV_PlayerPhysicsQC)
{ {
pr_global_struct->time = sv.time; pr_global_struct->time = sv.time;
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, sv_player); pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, sv_player);
PR_ExecuteProgram (svprogfuncs, SV_PlayerPhysicsQC); PR_ExecuteProgram (svprogfuncs, SV_PlayerPhysicsQC);
return; return;
} }
*/
if (sv_player->v.movetype == MOVETYPE_NONE) if (sv_player->v.movetype == MOVETYPE_NONE)
return; return;

17
engine/server/world.c
View file

@ -386,6 +386,9 @@ void SV_TouchLinks ( edict_t *ent, areanode_t *node )
|| ent->v.absmax[2] < touch->v.absmin[2] ) || ent->v.absmax[2] < touch->v.absmin[2] )
continue; continue;
if (!((int)ent->v.dimension_physics & (int)touch->v.dimension_physics))
continue;
nodelinks[linkcount++] = touch; nodelinks[linkcount++] = touch;
if (linkcount == MAX_NODELINKS) if (linkcount == MAX_NODELINKS)
break; break;
@ -410,6 +413,9 @@ void SV_TouchLinks ( edict_t *ent, areanode_t *node )
|| ent->v.absmax[2] < touch->v.absmin[2] ) || ent->v.absmax[2] < touch->v.absmin[2] )
continue; continue;
if (!((int)ent->v.dimension_physics & (int)touch->v.dimension_physics))
continue;
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, touch); pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, touch);
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, ent); pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, ent);
pr_global_struct->time = sv.time; pr_global_struct->time = sv.time;
@ -438,6 +444,9 @@ void SV_TouchLinks ( edict_t *ent, areanode_t *node )
|| ent->v.absmax[2] < touch->v.absmin[2] ) || ent->v.absmax[2] < touch->v.absmin[2] )
continue; continue;
if (!((int)ent->v.dimension_physics & (int)touch->dimension_physics))
continue;
old_self = pr_global_struct->self; old_self = pr_global_struct->self;
old_other = pr_global_struct->other; old_other = pr_global_struct->other;
@ -1452,6 +1461,9 @@ void SV_ClipMoveToEntities ( moveclip_t *clip )
if (clip->type & MOVE_NOMONSTERS && touch->v.solid != SOLID_BSP) if (clip->type & MOVE_NOMONSTERS && touch->v.solid != SOLID_BSP)
continue; continue;
if (!((int)clip->passedict->v.dimension_physics & (int)touch->v.dimension_physics))
continue;
// if ( !(clip->contentmask & CONTENTS_DEADMONSTER) // if ( !(clip->contentmask & CONTENTS_DEADMONSTER)
// && (touch->svflags & SVF_DEADMONSTER) ) // && (touch->svflags & SVF_DEADMONSTER) )
// continue; // continue;
@ -1597,6 +1609,9 @@ void SV_ClipToLinks ( areanode_t *node, moveclip_t *clip )
if (clip->passedict && clip->passedict->v.size[0] && !touch->v.size[0]) if (clip->passedict && clip->passedict->v.size[0] && !touch->v.size[0])
continue; // points never interact continue; // points never interact
if (!((int)clip->passedict->v.dimension_physics & (int)touch->v.dimension_physics))
continue;
// might intersect, so do an exact clip // might intersect, so do an exact clip
if (clip->trace.allsolid) if (clip->trace.allsolid)
return; return;
@ -1754,7 +1769,7 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e
memset ( &clip, 0, sizeof ( moveclip_t ) ); memset ( &clip, 0, sizeof ( moveclip_t ) );
if (progstype == PROG_H2 && passedict->v.hull) if (passedict->v.hull)
hullnum = passedict->v.hull; hullnum = passedict->v.hull;
else if (sv_compatablehulls.value) else if (sv_compatablehulls.value)
hullnum = 0; hullnum = 0;