X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=svvm_cmds.c;h=2b936116acc1b5fbc90424019df7866b05f435e4;hb=4a60b2cf069765f8a72995fbc5b0cd17d4102c8d;hp=2a1cb181202513f220275fcabe2843744d296a59;hpb=2382d45cfcebcc458f8889eb1477a5d9a8716939;p=xonotic%2Fdarkplaces.git diff --git a/svvm_cmds.c b/svvm_cmds.c index 2a1cb181..2b936116 100644 --- a/svvm_cmds.c +++ b/svvm_cmds.c @@ -3,7 +3,6 @@ //============================================================================ // Server -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 = @@ -68,8 +67,10 @@ char *vm_sv_extensions = "DP_QC_RANDOMVEC " "DP_QC_SINCOSSQRTPOW " "DP_QC_STRFTIME " +"DP_QC_STRING_CASE_FUNCTIONS " "DP_QC_STRINGBUFFERS " "DP_QC_STRINGCOLORFUNCTIONS " +"DP_QC_TOKENIZEBYSEPARATOR " "DP_QC_TRACEBOX " "DP_QC_TRACETOSS " "DP_QC_TRACE_MOVETYPE_HITMODEL " @@ -95,6 +96,8 @@ char *vm_sv_extensions = "DP_SV_DROPCLIENT " "DP_SV_EFFECT " "DP_SV_ENTITYCONTENTSTRANSITION " +"DP_SV_MODELFLAGS_AS_EFFECTS " +"DP_SV_NETADDRESS " "DP_SV_NODRAWTOCLIENT " "DP_SV_PING " "DP_SV_PLAYERPHYSICS " @@ -131,6 +134,8 @@ char *vm_sv_extensions = "PRYDON_CLIENTCURSOR " "TENEBRAE_GFX_DLIGHTS " "TW_SV_STEPCONTROL " +"DP_SV_CMD " +"DP_QC_CMD " ; /* @@ -275,9 +280,17 @@ static void VM_SV_sprint (void) int entnum; char string[VM_STRINGTEMP_LENGTH]; + VM_VarString(1, string, sizeof(string)); + VM_SAFEPARMCOUNTRANGE(2, 8, VM_SV_sprint); entnum = PRVM_G_EDICTNUM(OFS_PARM0); + // LordHavoc: div0 requested that sprintto world operate like print + if (entnum == 0) + { + Con_Print(string); + return; + } if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active) { @@ -289,7 +302,6 @@ static void VM_SV_sprint (void) if (!client->netconnection) return; - VM_VarString(1, string, sizeof(string)); MSG_WriteChar(&client->netconnection->message,svc_print); MSG_WriteString(&client->netconnection->message, string); } @@ -963,7 +975,7 @@ VM_SV_checkbottom */ static void VM_SV_checkbottom (void) { - VM_SAFEPARMCOUNT(0, VM_SV_checkbottom); + VM_SAFEPARMCOUNT(1, VM_SV_checkbottom); PRVM_G_FLOAT(OFS_RETURN) = SV_CheckBottom (PRVM_G_EDICT(OFS_PARM0)); } @@ -1096,7 +1108,6 @@ sizebuf_t *WriteDest (void) int entnum; int dest; prvm_edict_t *ent; - extern sizebuf_t *sv2csqcbuf; dest = (int)PRVM_G_FLOAT(OFS_PARM0); switch (dest) @@ -1124,7 +1135,7 @@ sizebuf_t *WriteDest (void) return &sv.signon; case MSG_ENTITY: - return sv2csqcbuf; + return sv.writeentitiestoclient_msg; } return NULL; @@ -1192,9 +1203,14 @@ static void VM_SV_makestatic (void) prvm_edict_t *ent; int i, large; - VM_SAFEPARMCOUNT(1, VM_SV_makestatic); + // allow 0 parameters due to an id1 qc bug in which this function is used + // with no parameters (but directly after setmodel with self in OFS_PARM0) + VM_SAFEPARMCOUNTRANGE(0, 1, VM_SV_makestatic); - ent = PRVM_G_EDICT(OFS_PARM0); + if (prog->argc >= 1) + ent = PRVM_G_EDICT(OFS_PARM0); + else + ent = PRVM_PROG_TO_EDICT(prog->globals.server->self); if (ent == prog->edicts) { VM_Warning("makestatic: can not modify world entity\n"); @@ -1248,7 +1264,7 @@ static void VM_SV_setspawnparms (void) int i; client_t *client; - VM_SAFEPARMCOUNT(0, VM_SV_setspawnparms); + VM_SAFEPARMCOUNT(1, VM_SV_setspawnparms); ent = PRVM_G_EDICT(OFS_PARM0); i = PRVM_NUM_FOR_EDICT(ent); @@ -1294,102 +1310,51 @@ typedef struct { unsigned char type; // 1/2/8 or other value if isn't used int fieldoffset; -}autosentstat_t; +}customstat_t; -static autosentstat_t *vm_autosentstats = NULL; //[515]: it starts from 0, not 32 -static int vm_autosentstats_last; +static customstat_t *vm_customstats = NULL; //[515]: it starts from 0, not 32 +static int vm_customstats_last; -void VM_AutoSentStats_Clear (void) +void VM_CustomStats_Clear (void) { - if(vm_autosentstats) + if(vm_customstats) { - Z_Free(vm_autosentstats); - vm_autosentstats = NULL; - vm_autosentstats_last = -1; + Z_Free(vm_customstats); + vm_customstats = NULL; + vm_customstats_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) +void VM_SV_UpdateCustomStats (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats) { - int i, v, *si; + int i; char s[17]; - const char *t; - qboolean send; - union - { - float f; - int i; - }k; - if(!vm_autosentstats) + if(!vm_customstats) 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 (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; + vm_customstats[i].type = type; + vm_customstats[i].fieldoffset = off; + if(vm_customstats_last < i) + vm_customstats_last = i; } /* @@ -1587,6 +1552,7 @@ static void VM_SV_te_blood (void) MSG_WriteByte(&sv.datagram, bound(-128, (int) PRVM_G_VECTOR(OFS_PARM1)[2], 127)); // count MSG_WriteByte(&sv.datagram, bound(0, (int) PRVM_G_FLOAT(OFS_PARM2), 255)); + SV_FlushBroadcastMessages(); } static void VM_SV_te_bloodshower (void) @@ -1608,6 +1574,7 @@ static void VM_SV_te_bloodshower (void) MSG_WriteCoord(&sv.datagram, PRVM_G_FLOAT(OFS_PARM2), sv.protocol); // count MSG_WriteShort(&sv.datagram, (int)bound(0, PRVM_G_FLOAT(OFS_PARM3), 65535)); + SV_FlushBroadcastMessages(); } static void VM_SV_te_explosionrgb (void) @@ -1623,6 +1590,7 @@ static void VM_SV_te_explosionrgb (void) MSG_WriteByte(&sv.datagram, bound(0, (int) (PRVM_G_VECTOR(OFS_PARM1)[0] * 255), 255)); MSG_WriteByte(&sv.datagram, bound(0, (int) (PRVM_G_VECTOR(OFS_PARM1)[1] * 255), 255)); MSG_WriteByte(&sv.datagram, bound(0, (int) (PRVM_G_VECTOR(OFS_PARM1)[2] * 255), 255)); + SV_FlushBroadcastMessages(); } static void VM_SV_te_particlecube (void) @@ -1652,6 +1620,7 @@ static void VM_SV_te_particlecube (void) MSG_WriteByte(&sv.datagram, ((int) PRVM_G_FLOAT(OFS_PARM5)) != 0); // randomvel MSG_WriteCoord(&sv.datagram, PRVM_G_FLOAT(OFS_PARM6), sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_particlerain (void) @@ -1677,6 +1646,7 @@ static void VM_SV_te_particlerain (void) MSG_WriteShort(&sv.datagram, (int)bound(0, PRVM_G_FLOAT(OFS_PARM3), 65535)); // color MSG_WriteByte(&sv.datagram, (int)PRVM_G_FLOAT(OFS_PARM4)); + SV_FlushBroadcastMessages(); } static void VM_SV_te_particlesnow (void) @@ -1702,6 +1672,7 @@ static void VM_SV_te_particlesnow (void) MSG_WriteShort(&sv.datagram, (int)bound(0, PRVM_G_FLOAT(OFS_PARM3), 65535)); // color MSG_WriteByte(&sv.datagram, (int)PRVM_G_FLOAT(OFS_PARM4)); + SV_FlushBroadcastMessages(); } static void VM_SV_te_spark (void) @@ -1721,6 +1692,7 @@ static void VM_SV_te_spark (void) MSG_WriteByte(&sv.datagram, bound(-128, (int) PRVM_G_VECTOR(OFS_PARM1)[2], 127)); // count MSG_WriteByte(&sv.datagram, bound(0, (int) PRVM_G_FLOAT(OFS_PARM2), 255)); + SV_FlushBroadcastMessages(); } static void VM_SV_te_gunshotquad (void) @@ -1732,6 +1704,7 @@ static void VM_SV_te_gunshotquad (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_spikequad (void) @@ -1743,6 +1716,7 @@ static void VM_SV_te_spikequad (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_superspikequad (void) @@ -1754,6 +1728,7 @@ static void VM_SV_te_superspikequad (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_explosionquad (void) @@ -1765,6 +1740,7 @@ static void VM_SV_te_explosionquad (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_smallflash (void) @@ -1776,6 +1752,7 @@ static void VM_SV_te_smallflash (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_customflash (void) @@ -1797,6 +1774,7 @@ static void VM_SV_te_customflash (void) MSG_WriteByte(&sv.datagram, (int)bound(0, PRVM_G_VECTOR(OFS_PARM3)[0] * 255, 255)); MSG_WriteByte(&sv.datagram, (int)bound(0, PRVM_G_VECTOR(OFS_PARM3)[1] * 255, 255)); MSG_WriteByte(&sv.datagram, (int)bound(0, PRVM_G_VECTOR(OFS_PARM3)[2] * 255, 255)); + SV_FlushBroadcastMessages(); } static void VM_SV_te_gunshot (void) @@ -1808,6 +1786,7 @@ static void VM_SV_te_gunshot (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_spike (void) @@ -1819,6 +1798,7 @@ static void VM_SV_te_spike (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_superspike (void) @@ -1830,6 +1810,7 @@ static void VM_SV_te_superspike (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_explosion (void) @@ -1841,6 +1822,7 @@ static void VM_SV_te_explosion (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_tarexplosion (void) @@ -1852,6 +1834,7 @@ static void VM_SV_te_tarexplosion (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_wizspike (void) @@ -1863,6 +1846,7 @@ static void VM_SV_te_wizspike (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_knightspike (void) @@ -1874,6 +1858,7 @@ static void VM_SV_te_knightspike (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_lavasplash (void) @@ -1885,6 +1870,7 @@ static void VM_SV_te_lavasplash (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_teleport (void) @@ -1896,6 +1882,7 @@ static void VM_SV_te_teleport (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_explosion2 (void) @@ -1910,6 +1897,7 @@ static void VM_SV_te_explosion2 (void) // color MSG_WriteByte(&sv.datagram, (int)PRVM_G_FLOAT(OFS_PARM1)); MSG_WriteByte(&sv.datagram, (int)PRVM_G_FLOAT(OFS_PARM2)); + SV_FlushBroadcastMessages(); } static void VM_SV_te_lightning1 (void) @@ -1927,6 +1915,7 @@ static void VM_SV_te_lightning1 (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_lightning2 (void) @@ -1944,6 +1933,7 @@ static void VM_SV_te_lightning2 (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_lightning3 (void) @@ -1961,6 +1951,7 @@ static void VM_SV_te_lightning3 (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_beam (void) @@ -1978,6 +1969,7 @@ static void VM_SV_te_beam (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_plasmaburn (void) @@ -1988,6 +1980,7 @@ static void VM_SV_te_plasmaburn (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[0], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[1], sv.protocol); MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol); + SV_FlushBroadcastMessages(); } static void VM_SV_te_flamejet (void) @@ -2005,6 +1998,7 @@ static void VM_SV_te_flamejet (void) MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM1)[2], sv.protocol); // count MSG_WriteByte(&sv.datagram, (int)PRVM_G_FLOAT(OFS_PARM2)); + SV_FlushBroadcastMessages(); } void clippointtosurface(model_t *model, msurface_t *surface, vec3_t p, vec3_t out) @@ -2643,6 +2637,7 @@ static void VM_SV_trailparticles (void) MSG_WriteShort(&sv.datagram, (int)PRVM_G_FLOAT(OFS_PARM1)); MSG_WriteVector(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2), sv.protocol); MSG_WriteVector(&sv.datagram, PRVM_G_VECTOR(OFS_PARM3), sv.protocol); + SV_FlushBroadcastMessages(); } //#337 void(float effectnum, vector origin, vector dir, float count) pointparticles (EXT_CSQC) @@ -2655,6 +2650,7 @@ static void VM_SV_pointparticles (void) MSG_WriteVector(&sv.datagram, PRVM_G_VECTOR(OFS_PARM1), sv.protocol); MSG_WriteVector(&sv.datagram, PRVM_G_VECTOR(OFS_PARM2), sv.protocol); MSG_WriteShort(&sv.datagram, bound(0, (int)PRVM_G_FLOAT(OFS_PARM3), 65535)); + SV_FlushBroadcastMessages(); } prvm_builtin_t vm_sv_builtins[] = { @@ -3141,9 +3137,9 @@ VM_tan, // #475 float(float a) VM_tan (DP_QC_ASINACOSATANATAN2TAN) VM_strlennocol, // #476 float(string s) : DRESK - String Length (not counting color codes) (DP_QC_STRINGCOLORFUNCTIONS) VM_strdecolorize, // #477 string(string s) : DRESK - Decolorized String (DP_SV_STRINGCOLORFUNCTIONS) VM_strftime, // #478 string(float uselocaltime, string format, ...) (DP_QC_STRFTIME) -NULL, // #479 -NULL, // #480 -NULL, // #481 +VM_tokenizebyseparator, // #479 float(string s) tokenizebyseparator (DP_QC_TOKENIZEBYSEPARATOR) +VM_strtolower, // #480 string(string s) VM_strtolower : DRESK - Return string as lowercase +VM_strtoupper, // #481 string(string s) VM_strtoupper : DRESK - Return string as uppercase NULL, // #482 NULL, // #483 NULL, // #484