// Server
#define PF_WARNING(s) do{Con_Printf(s);PRVM_PrintState();return;}while(0)
-cvar_t sv_aim = {CVAR_SAVE, "sv_aim", "2"}; //"0.93"}; // LordHavoc: disabled autoaim by default
+cvar_t sv_aim = {CVAR_SAVE, "sv_aim", "2", "maximum cosine angle for quake's vertical autoaim, a value above 1 completely disables the autoaim, quake used 0.93"}; //"0.93"}; // LordHavoc: disabled autoaim by default
char *vm_sv_extensions =
"DP_EF_BLUE "
"DP_EF_FLAME "
"DP_EF_FULLBRIGHT "
+"DP_EF_DOUBLESIDED "
"DP_EF_NODEPTHTEST "
"DP_EF_NODRAW "
"DP_EF_NOSHADOW "
"DP_QC_MULTIPLETEMPSTRINGS "
"DP_QC_RANDOMVEC "
"DP_QC_SINCOSSQRTPOW "
+"DP_QC_STRINGBUFFERS "
"DP_QC_TRACEBOX "
"DP_QC_TRACETOSS "
"DP_QC_TRACE_MOVETYPE_HITMODEL "
"DP_TE_SPARK "
"DP_TE_STANDARDEFFECTBUILTINS "
"DP_VIEWZOOM "
+"EXT_BITSHIFT "
+//"EXT_CSQC " // not ready yet
"FRIK_FILE "
"KRIMZON_SV_PARSECLIENTCOMMAND "
"NEH_CMD_PLAY2 "
AngleVectors (PRVM_G_VECTOR(OFS_PARM0), prog->globals.server->v_forward, prog->globals.server->v_right, prog->globals.server->v_up);
}
-/*
-==============
-PF_vectorvectors
-
-Writes new values for v_forward, v_up, and v_right based on the given forward vector
-vectorvectors(vector, vector)
-==============
-*/
-void PF_vectorvectors (void)
-{
- VectorNormalize2(PRVM_G_VECTOR(OFS_PARM0), prog->globals.server->v_forward);
- VectorVectors(prog->globals.server->v_forward, prog->globals.server->v_right, prog->globals.server->v_up);
-}
-
/*
=================
PF_setorigin
}
client = svs.clients + entnum-1;
+ if (!client->netconnection)
+ return;
+
VM_VarString(1, string, sizeof(string));
- MSG_WriteChar(&client->message,svc_print);
- MSG_WriteString(&client->message, string);
+ MSG_WriteChar(&client->netconnection->message,svc_print);
+ MSG_WriteString(&client->netconnection->message, string);
}
}
client = svs.clients + entnum-1;
+ if (!client->netconnection)
+ return;
+
VM_VarString(1, string, sizeof(string));
- MSG_WriteChar(&client->message,svc_centerprint);
- MSG_WriteString(&client->message, string);
+ MSG_WriteChar(&client->netconnection->message,svc_centerprint);
+ MSG_WriteString(&client->netconnection->message, string);
}
/*
move = PRVM_G_FLOAT(OFS_PARM2);
ent = PRVM_G_EDICT(OFS_PARM3);
+ if (IS_NAN(v1[0]) || IS_NAN(v1[1]) || IS_NAN(v1[2]) || IS_NAN(v2[0]) || IS_NAN(v1[2]) || IS_NAN(v2[2]))
+ PRVM_ERROR("%s: NAN errors detected in traceline('%f %f %f', '%f %f %f', %i, entity %i)\n", PRVM_NAME, v1[0], v1[1], v1[2], v2[0], v2[1], v2[2], move, PRVM_EDICT_TO_PROG(ent));
+
trace = SV_Move (v1, vec3_origin, vec3_origin, v2, move, ent);
prog->globals.server->trace_allsolid = trace.allsolid;
move = PRVM_G_FLOAT(OFS_PARM4);
ent = PRVM_G_EDICT(OFS_PARM5);
+ if (IS_NAN(v1[0]) || IS_NAN(v1[1]) || IS_NAN(v1[2]) || IS_NAN(v2[0]) || IS_NAN(v1[2]) || IS_NAN(v2[2]))
+ PRVM_ERROR("%s: NAN errors detected in tracebox('%f %f %f', '%f %f %f', '%f %f %f', '%f %f %f', %i, entity %i)\n", PRVM_NAME, v1[0], v1[1], v1[2], m1[0], m1[1], m1[2], m2[0], m2[1], m2[2], v2[0], v2[1], v2[2], move, PRVM_EDICT_TO_PROG(ent));
+
trace = SV_Move (v1, m1, m2, v2, move, ent);
prog->globals.server->trace_allsolid = trace.allsolid;
for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
{
- if (client->active)
+ if (client->active && client->netconnection)
{
- MSG_WriteChar (&client->message, svc_lightstyle);
- MSG_WriteChar (&client->message,style);
- MSG_WriteString (&client->message, val);
+ MSG_WriteChar (&client->netconnection->message, svc_lightstyle);
+ MSG_WriteChar (&client->netconnection->message,style);
+ MSG_WriteString (&client->netconnection->message, val);
}
}
}
#define MSG_ONE 1 // reliable to one (msg_entity)
#define MSG_ALL 2 // reliable to all
#define MSG_INIT 3 // write to the init string
+#define MSG_ENTITY 5
sizebuf_t *WriteDest (void)
{
int entnum;
int dest;
prvm_edict_t *ent;
+ extern sizebuf_t *sv2csqcbuf;
dest = PRVM_G_FLOAT(OFS_PARM0);
switch (dest)
case MSG_ONE:
ent = PRVM_PROG_TO_EDICT(prog->globals.server->msg_entity);
entnum = PRVM_NUM_FOR_EDICT(ent);
- if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
+ if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active || !svs.clients[entnum-1].netconnection)
{
Con_Printf ("WriteDest: tried to write to non-client\n");
return &sv.reliable_datagram;
}
else
- return &svs.clients[entnum-1].message;
+ return &svs.clients[entnum-1].netconnection->message;
default:
Con_Printf ("WriteDest: bad destination\n");
case MSG_INIT:
return &sv.signon;
+
+ case MSG_ENTITY:
+ return sv2csqcbuf;
}
return NULL;
PRVM_G_FLOAT(OFS_RETURN) = 1; // success
}
+typedef struct
+{
+ unsigned char type; // 1/2/8 or other value if isn't used
+ int fieldoffset;
+}autosentstat_t;
+
+static autosentstat_t *vm_autosentstats = NULL; //[515]: it starts from 0, not 32
+static int vm_autosentstats_last;
+
+void VM_AutoSentStats_Clear (void)
+{
+ if(vm_autosentstats)
+ {
+ free(vm_autosentstats);
+ vm_autosentstats = NULL;
+ vm_autosentstats_last = -1;
+ }
+}
+
+//[515]: add check if even bigger ? "try to use two stats, cause it's too big" ?
+#define VM_SENDSTAT(a,b,c)\
+{\
+/* if((c))*/\
+ if((c)==(unsigned char)(c))\
+ {\
+ MSG_WriteByte((a), svc_updatestatubyte);\
+ MSG_WriteByte((a), (b));\
+ MSG_WriteByte((a), (c));\
+ }\
+ else\
+ {\
+ MSG_WriteByte((a), svc_updatestat);\
+ MSG_WriteByte((a), (b));\
+ MSG_WriteLong((a), (c));\
+ }\
+}\
+
+void VM_SV_WriteAutoSentStats (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats)
+{
+ int i, v, *si;
+ char s[17];
+ const char *t;
+ qboolean send;
+ union
+ {
+ float f;
+ int i;
+ }k;
+
+ if(!vm_autosentstats)
+ return;
+
+ send = (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5);
+
+ for(i=0; i<vm_autosentstats_last+1 ;i++)
+ {
+ if(!vm_autosentstats[i].type)
+ continue;
+ switch(vm_autosentstats[i].type)
+ {
+ //string
+ case 1:
+ t = PRVM_E_STRING(ent, vm_autosentstats[i].fieldoffset);
+ if(t && t[0])
+ {
+ memset(s, 0, 17);
+ strlcpy(s, t, 16);
+ si = (int*)s;
+ if (!send)
+ {
+ stats[i+32] = si[0];
+ stats[i+33] = si[1];
+ stats[i+34] = si[2];
+ stats[i+35] = si[3];
+ }
+ else
+ {
+ VM_SENDSTAT(msg, i+32, si[0]);
+ VM_SENDSTAT(msg, i+33, si[1]);
+ VM_SENDSTAT(msg, i+34, si[2]);
+ VM_SENDSTAT(msg, i+35, si[3]);
+ }
+ }
+ break;
+ //float
+ case 2:
+ k.f = PRVM_E_FLOAT(ent, vm_autosentstats[i].fieldoffset); //[515]: use PRVM_E_INT ?
+ k.i = LittleLong (k.i);
+ if (!send)
+ stats[i+32] = k.i;
+ else
+ VM_SENDSTAT(msg, i+32, k.i);
+ break;
+ //integer
+ case 8:
+ v = PRVM_E_FLOAT(ent, vm_autosentstats[i].fieldoffset); //[515]: use PRVM_E_INT ?
+ if (!send)
+ stats[i+32] = v;
+ else
+ VM_SENDSTAT(msg, i+32, v);
+ break;
+ default:
+ break;
+ }
+ }
+}
+
+// void(float index, float type, .void field) SV_AddStat = #470;
+// Set up an auto-sent player stat.
+// Client's get thier own fields sent to them. Index may not be less than 32.
+// Type is a value equating to the ev_ values found in qcc to dictate types. Valid ones are:
+// 1: string (4 stats carrying a total of 16 charactures)
+// 2: float (one stat, float converted to an integer for transportation)
+// 8: integer (one stat, not converted to an int, so this can be used to transport floats as floats - what a unique idea!)
+void PF_SV_AddStat (void)
+{
+ int off, i;
+ unsigned char type;
+
+ if(!vm_autosentstats)
+ {
+ vm_autosentstats = malloc((MAX_CL_STATS-32) * sizeof(autosentstat_t));
+ if(!vm_autosentstats)
+ {
+ Con_Printf("PF_SV_AddStat: not enough memory\n");
+ return;
+ }
+ }
+ i = PRVM_G_FLOAT(OFS_PARM0);
+ type = PRVM_G_FLOAT(OFS_PARM1);
+ off = PRVM_G_INT (OFS_PARM2);
+ i -= 32;
+
+ if(i < 0)
+ {
+ Con_Printf("PF_SV_AddStat: index may not be less than 32\n");
+ return;
+ }
+ if(i >= (MAX_CL_STATS-32))
+ {
+ Con_Printf("PF_SV_AddStat: index >= MAX_CL_STATS\n");
+ return;
+ }
+ if(i > (MAX_CL_STATS-32-4) && type == 1)
+ {
+ Con_Printf("PF_SV_AddStat: index > (MAX_CL_STATS-4) with string\n");
+ return;
+ }
+ vm_autosentstats[i].type = type;
+ vm_autosentstats[i].fieldoffset = off;
+ if(vm_autosentstats_last < i)
+ vm_autosentstats_last = i;
+}
+
/*
=================
PF_copyentity
MSG_WriteByte(&sv.datagram, PRVM_G_FLOAT(OFS_PARM2));
}
-static void clippointtosurface(msurface_t *surface, vec3_t p, vec3_t out)
+void clippointtosurface(msurface_t *surface, vec3_t p, vec3_t out)
{
int i, j, k;
float *v[3], facenormal[3], edgenormal[3], sidenormal[3], temp[3], offsetdist, dist, bestdist;
frame = 0;
return Mod_Alias_GetTagMatrix(model, model->animscenes[frame].firstframe, tagindex, out);
}
- Matrix4x4_CreateIdentity(out);
+ *out = identitymatrix;
return 0;
}
matrix4x4_t entitymatrix, tagmatrix, attachmatrix;
model_t *model;
- Matrix4x4_CreateIdentity(out); // warnings and errors return identical matrix
+ *out = identitymatrix; // warnings and errors return identical matrix
if (ent == prog->edicts)
return 1;
model = sv.models[modelindex];
- Matrix4x4_CreateIdentity(&tagmatrix);
+ tagmatrix = identitymatrix;
// DP_GFX_QUAKE3MODELTAGS, scan all chain and stop on unattached entity
attachloop = 0;
for (;;)
{
prog->xfunction->builtinsprofile += 100;
SV_ConnectClient (i, NULL);
+ // this has to be set or else ClientDisconnect won't be called
+ // we assume the qc will call ClientConnect...
+ svs.clients[i].clientconnectcalled = true;
ed = PRVM_EDICT_NUM(i + 1);
break;
}
PRVM_G_FLOAT(OFS_RETURN) = 2;
}
+void PF_edict_num (void)
+{
+ VM_RETURN_EDICT(PRVM_EDICT_NUM((int)PRVM_G_FLOAT(OFS_PARM0)));
+}
+
prvm_builtin_t vm_sv_builtins[] = {
NULL, // #0
-PF_makevectors, // #1 void(entity e) makevectors
+PF_makevectors, // #1 void(vector ang) makevectors
PF_setorigin, // #2 void(entity e, vector o) setorigin
PF_setmodel, // #3 void(entity e, string m) setmodel
PF_setsize, // #4 void(entity e, vector min, vector max) setsize
VM_strzone, // #118 string(string s) strzone (FRIK_FILE)
VM_strunzone, // #119 void(string s) strunzone (FRIK_FILE)
e10, e10, e10, e10, e10, e10, e10, e10, // #120-199
-e10, e10, e10, e10, e10, e10, e10, e10, e10, e10, // #200-299
+// FTEQW range #200-#299
+NULL, // #200
+NULL, // #201
+NULL, // #202
+NULL, // #203
+NULL, // #204
+NULL, // #205
+NULL, // #206
+NULL, // #207
+NULL, // #208
+NULL, // #209
+NULL, // #210
+NULL, // #211
+NULL, // #212
+NULL, // #213
+NULL, // #214
+NULL, // #215
+NULL, // #216
+NULL, // #217
+VM_bitshift, // #218 float(float number, float quantity) bitshift (EXT_BITSHIFT)
+NULL, // #219
+e10, // #220-#229
+e10, // #230-#239
+e10, // #240-#249
+e10, // #250-#259
+e10, // #260-#269
+e10, // #270-#279
+e10, // #280-#289
+e10, // #290-#299
e10, e10, e10, e10, e10, e10, e10, e10, e10, e10, // #300-399
VM_copyentity, // #400 void(entity from, entity to) copyentity (DP_QC_COPYENTITY)
PF_setcolor, // #401 void(entity ent, float colors) setcolor (DP_QC_SETCOLOR)
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_te_beam, // #431 void(entity own, vector start, vector end) te_beam (DP_TE_STANDARDEFFECTBUILTINS)
-PF_vectorvectors, // #432 void(vector dir) vectorvectors (DP_QC_VECTORVECTORS)
+VM_vectorvectors, // #432 void(vector dir) vectorvectors (DP_QC_VECTORVECTORS)
PF_te_plasmaburn, // #433 void(vector org) te_plasmaburn (DP_TE_PLASMABURN)
PF_getsurfacenumpoints, // #434 float(entity e, float s) getsurfacenumpoints (DP_QC_GETSURFACE)
PF_getsurfacepoint, // #435 vector(entity e, float s, float n) getsurfacepoint (DP_QC_GETSURFACE)
PF_WriteUnterminatedString, // #456 void(float to, string s) WriteUnterminatedString (DP_SV_WRITEUNTERMINATEDSTRING)
PF_te_flamejet, // #457 void(vector org, vector vel, float howmany) te_flamejet = #457 (DP_TE_FLAMEJET)
NULL, // #458
-NULL, // #459
-e10, e10, e10, e10 // #460-499 (LordHavoc)
+PF_edict_num, // #459 entity(float num) (??)
+VM_buf_create, // #460 float() buf_create (DP_QC_STRINGBUFFERS)
+VM_buf_del, // #461 void(float bufhandle) buf_del (DP_QC_STRINGBUFFERS)
+VM_buf_getsize, // #462 float(float bufhandle) buf_getsize (DP_QC_STRINGBUFFERS)
+VM_buf_copy, // #463 void(float bufhandle_from, float bufhandle_to) buf_copy (DP_QC_STRINGBUFFERS)
+VM_buf_sort, // #464 void(float bufhandle, float sortpower, float backward) buf_sort (DP_QC_STRINGBUFFERS)
+VM_buf_implode, // #465 string(float bufhandle, string glue) buf_implode (DP_QC_STRINGBUFFERS)
+VM_bufstr_get, // #466 string(float bufhandle, float string_index) bufstr_get (DP_QC_STRINGBUFFERS)
+VM_bufstr_set, // #467 void(float bufhandle, float string_index, string str) bufstr_set (DP_QC_STRINGBUFFERS)
+VM_bufstr_add, // #468 float(float bufhandle, string str, float order) bufstr_add (DP_QC_STRINGBUFFERS)
+VM_bufstr_free, // #469 void(float bufhandle, float string_index) bufstr_free (DP_QC_STRINGBUFFERS)
+PF_SV_AddStat, // #470 void(float index, float type, .void field) SV_AddStat (EXT_CSQC)
+NULL, // #471
+NULL, // #472
+NULL, // #473
+NULL, // #474
+NULL, // #475
+NULL, // #476
+NULL, // #477
+NULL, // #478
+NULL, // #479
+e10, e10 // #480-499 (LordHavoc)
};
const int vm_sv_numbuiltins = sizeof(vm_sv_builtins) / sizeof(prvm_builtin_t);
projects / xonotic / darkplaces.git / blobdiff