removed \n from all Host_Error, Sys_Error, PRVM_ERROR, PF_ERROR calls, since Host_Err...

[xonotic/darkplaces.git] / svvm_cmds.c

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 5eed529dd6a92be80f7146a3a18603364c21e64f..89b03104523a0b2f068c5b38f780fc49ec938ac5 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -8,6 +8,8 @@ cvar_t sv_aim = {CVAR_SAVE, "sv_aim", "2"}; //"0.93"}; // LordHavoc: disabled au
 
 
 char *vm_sv_extensions =
+"DP_CON_EXPANDCVAR "
+"DP_CON_ALIASPARAMETERS "
 "DP_BUTTONCHAT "
 "DP_BUTTONUSE "
 "DP_CL_LOADSKY "
@@ -24,6 +26,7 @@ char *vm_sv_extensions =
 "DP_EF_RED "
 "DP_EF_STARDUST "
 "DP_ENT_ALPHA "
+"DP_ENT_COLORMOD "
 "DP_ENT_CUSTOMCOLORMAP "
 "DP_ENT_EXTERIORMODELTOCLIENT "
 "DP_ENT_GLOW "
@@ -86,10 +89,12 @@ char *vm_sv_extensions =
 "DP_SV_NODRAWTOCLIENT "
 "DP_SV_PING "
 "DP_SV_PLAYERPHYSICS "
+"DP_SV_PRECACHEANYTIME "
 "DP_SV_PUNCHVECTOR "
 "DP_SV_ROTATINGBMODEL "
 "DP_SV_SETCOLOR "
 "DP_SV_SLOWMO "
+"DP_SV_WRITEUNTERMINATEDSTRING "
 "DP_TE_BLOOD "
 "DP_TE_BLOODSHOWER "
 "DP_TE_CUSTOMFLASH "
@@ -113,7 +118,6 @@ char *vm_sv_extensions =
 "TENEBRAE_GFX_DLIGHTS "
 "TW_SV_STEPCONTROL "
 "NEXUIZ_PLAYERMODEL "
-"NEXUIZ_PLAYERSKIN "
 ;
 
 /*
@@ -174,7 +178,7 @@ void SetMinMaxSize (prvm_edict_t *e, float *min, float *max, qboolean rotate)
 
        for (i=0 ; i<3 ; i++)
                if (min[i] > max[i])
-                       PRVM_ERROR("SetMinMaxSize: backwards mins/maxs\n");
+                       PRVM_ERROR("SetMinMaxSize: backwards mins/maxs");
 
 // set derived values
        VectorCopy (min, e->fields.server->mins);
@@ -548,7 +552,7 @@ void PF_checkpos (void)
 //============================================================================
 
 int checkpvsbytes;
-qbyte checkpvs[MAX_MAP_LEAFS/8];
+unsigned char checkpvs[MAX_MAP_LEAFS/8];
 
 int PF_newcheckclient (int check)
 {
@@ -860,6 +864,10 @@ void PF_lightstyle (void)
        style = PRVM_G_FLOAT(OFS_PARM0);
        val = PRVM_G_STRING(OFS_PARM1);
 
+       if( (unsigned) style >= MAX_LIGHTSTYLES ) {
+               PRVM_ERROR( "PF_lightstyle: style: %i >= 64", style );
+       }
+
 // change the string in sv
        strlcpy(sv.lightstyles[style], val, sizeof(sv.lightstyles[style]));
 
@@ -895,7 +903,7 @@ PF_pointcontents
 */
 void PF_pointcontents (void)
 {
-       PRVM_G_FLOAT(OFS_RETURN) = SV_PointQ1Contents(PRVM_G_VECTOR(OFS_PARM0));
+       PRVM_G_FLOAT(OFS_RETURN) = Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(PRVM_G_VECTOR(OFS_PARM0)));
 }
 
 /*
@@ -1133,7 +1141,7 @@ sizebuf_t *WriteDest (void)
                        return &svs.clients[entnum-1].message;
 
        default:
-               Con_Printf ("WriteDest: bad destination");
+               Con_Printf ("WriteDest: bad destination\n");
        case MSG_ALL:
                return &sv.reliable_datagram;
 
@@ -1179,6 +1187,11 @@ void PF_WriteString (void)
        MSG_WriteString (WriteDest(), PRVM_G_STRING(OFS_PARM1));
 }
 
+void PF_WriteUnterminatedString (void)
+{
+       MSG_WriteUnterminatedString (WriteDest(), PRVM_G_STRING(OFS_PARM1));
+}
+
 
 void PF_WriteEntity (void)
 {
@@ -1783,6 +1796,22 @@ void PF_te_plasmaburn (void)
        MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
+void PF_te_flamejet (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_FLAMEJET);
+       // org
+       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);
+       // vel
+       MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM1)[0], sv.protocol);
+       MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM1)[1], sv.protocol);
+       MSG_WriteCoord(&sv.datagram, PRVM_G_VECTOR(OFS_PARM1)[2], sv.protocol);
+       // count
+       MSG_WriteByte(&sv.datagram, PRVM_G_FLOAT(OFS_PARM2));
+}
+
 static void clippointtosurface(msurface_t *surface, vec3_t p, vec3_t out)
 {
        int i, j, k;
@@ -2463,8 +2492,8 @@ PF_gettaginfo,                            // #452 vector(entity ent, float tagindex) gettaginfo (DP_QC_G
 PF_dropclient,                         // #453 void(entity clent) dropclient (DP_SV_DROPCLIENT)
 PF_spawnclient,                                // #454 entity() spawnclient (DP_SV_BOTCLIENT)
 PF_clienttype,                         // #455 float(entity clent) clienttype (DP_SV_BOTCLIENT)
-NULL,                                          // #456
-NULL,                                          // #457
+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)