added BX_WAL_SUPPORT to extensions list and documented it (.wal texture support has...

[xonotic/darkplaces.git] / svvm_cmds.c

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 1bf84cb50da1fd4a4786b7711c5d380bc10749ea..f6043336bb8406f3c8453cdbd94b548d1abafdf2 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -7,6 +7,7 @@ cvar_t sv_aim = {CVAR_SAVE, "sv_aim", "2", "maximum cosine angle for quake's ver
 
 
 char *vm_sv_extensions =
+"BX_WAL_SUPPORT "
 "DP_CON_EXPANDCVAR "
 "DP_CON_ALIASPARAMETERS "
 "DP_BUTTONCHAT "
@@ -67,6 +68,8 @@ char *vm_sv_extensions =
 "DP_QC_RANDOMVEC "
 "DP_QC_SINCOSSQRTPOW "
 "DP_QC_STRINGBUFFERS "
+"DP_QC_STRINGCOLORFUNCTIONS "
+"DP_QC_UNLIMITEDTEMPSTRINGS "
 "DP_QC_TRACEBOX "
 "DP_QC_TRACETOSS "
 "DP_QC_TRACE_MOVETYPE_HITMODEL "
@@ -90,6 +93,7 @@ char *vm_sv_extensions =
 "DP_SV_DRAWONLYTOCLIENT "
 "DP_SV_DROPCLIENT "
 "DP_SV_EFFECT "
+"DP_SV_ENTITYCONTENTSTRANSITION "
 "DP_SV_NODRAWTOCLIENT "
 "DP_SV_PING "
 "DP_SV_PLAYERPHYSICS "
@@ -495,11 +499,7 @@ void PF_traceline (void)
        if ((val = PRVM_GETGLOBALFIELDVALUE(gval_trace_dphittexturename)))
        {
                if (trace.hittexture)
-               {
-                       char *s = VM_GetTempString();
-                       strlcpy(s, trace.hittexture->name, VM_STRINGTEMP_LENGTH);
-                       val->string = PRVM_SetEngineString(s);
-               }
+                       val->string = PRVM_SetTempString(trace.hittexture->name);
                else
                        val->string = 0;
        }
@@ -561,11 +561,7 @@ void PF_tracebox (void)
        if ((val = PRVM_GETGLOBALFIELDVALUE(gval_trace_dphittexturename)))
        {
                if (trace.hittexture)
-               {
-                       char *s = VM_GetTempString();
-                       strlcpy(s, trace.hittexture->name, VM_STRINGTEMP_LENGTH);
-                       val->string = PRVM_SetEngineString(s);
-               }
+                       val->string = PRVM_SetTempString(trace.hittexture->name);
                else
                        val->string = 0;
        }
@@ -612,11 +608,7 @@ void PF_tracetoss (void)
        if ((val = PRVM_GETGLOBALFIELDVALUE(gval_trace_dphittexturename)))
        {
                if (trace.hittexture)
-               {
-                       char *s = VM_GetTempString();
-                       strlcpy(s, trace.hittexture->name, VM_STRINGTEMP_LENGTH);
-                       val->string = PRVM_SetEngineString(s);
-               }
+                       val->string = PRVM_SetTempString(trace.hittexture->name);
                else
                        val->string = 0;
        }
@@ -936,9 +928,10 @@ void PF_droptofloor (void)
 
        trace = SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent);
 
-       if (trace.fraction != 1)
+       if (trace.fraction != 1 || (trace.startsolid && sv_gameplayfix_droptofloorstartsolid.integer))
        {
-               VectorCopy (trace.endpos, ent->fields.server->origin);
+               if (trace.fraction < 1)
+                       VectorCopy (trace.endpos, ent->fields.server->origin);
                SV_LinkEdict (ent, false);
                ent->fields.server->flags = (int)ent->fields.server->flags | FL_ONGROUND;
                ent->fields.server->groundentity = PRVM_EDICT_TO_PROG(trace.ent);
@@ -1691,7 +1684,7 @@ void PF_effect (void)
        int i;
        const char *s;
        s = PRVM_G_STRING(OFS_PARM1);
-       if (!s || !s[0])
+       if (!s[0])
        {
                VM_Warning("effect: no model specified\n");
                return;
@@ -1703,6 +1696,19 @@ void PF_effect (void)
                VM_Warning("effect: model not precached\n");
                return;
        }
+
+       if (PRVM_G_FLOAT(OFS_PARM3) < 1)
+       {
+               VM_Warning("effect: framecount < 1\n");
+               return;
+       }
+
+       if (PRVM_G_FLOAT(OFS_PARM4) < 1)
+       {
+               VM_Warning("effect: framerate < 1\n");
+               return;
+       }
+
        SV_StartEffect(PRVM_G_VECTOR(OFS_PARM0), i, (int)PRVM_G_FLOAT(OFS_PARM2), (int)PRVM_G_FLOAT(OFS_PARM3), (int)PRVM_G_FLOAT(OFS_PARM4));
 }
 
@@ -2224,10 +2230,10 @@ void PF_getsurfacetexture(void)
 {
        model_t *model;
        msurface_t *surface;
-       PRVM_G_INT(OFS_RETURN) = 0;
+       PRVM_G_INT(OFS_RETURN) = OFS_NULL;
        if (!(model = getmodel(PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
                return;
-       PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(surface->texture->name);
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(surface->texture->name);
 }
 //PF_getsurfacenearpoint, // #438 float(entity e, vector p) getsurfacenearpoint = #438;
 void PF_getsurfacenearpoint(void)
@@ -2856,8 +2862,8 @@ VM_acos,                                  // #472 float(float c) VM_acos (DP_QC_ASINACOSATANATAN2TAN)
 VM_atan,                                       // #473 float(float t) VM_atan (DP_QC_ASINACOSATANATAN2TAN)
 VM_atan2,                                      // #474 float(float c, float s) VM_atan2 (DP_QC_ASINACOSATANATAN2TAN)
 VM_tan,                                                // #475 float(float a) VM_tan (DP_QC_ASINACOSATANATAN2TAN)
-NULL,                                          // #476
-NULL,                                          // #477
+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)
 NULL,                                          // #478
 NULL,                                          // #479
 e10, e10                                       // #480-499 (LordHavoc)