fix the EndIncreaseEdicts handlers as edicts beyond num_edicts are not initialized yet

[xonotic/darkplaces.git] / clvm_cmds.c

diff --git a/clvm_cmds.c b/clvm_cmds.c
index f328ee119d1089f13982a9e6957147a722f6647e..06d1d648df927f6ba0c8dbeef63c3ef87db1e208 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -1284,13 +1284,6 @@ static void VM_CL_getplayerkey (void)
        PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(t);
 }
 
-//#349 float() isdemo (EXT_CSQC)
-static void VM_CL_isdemo (void)
-{
-       VM_SAFEPARMCOUNT(0, VM_CL_isdemo);
-       PRVM_G_FLOAT(OFS_RETURN) = cls.demoplayback;
-}
-
 //#351 void(vector origin, vector forward, vector right, vector up) SetListener (EXT_CSQC)
 static void VM_CL_setlistener (void)
 {
@@ -2936,9 +2929,7 @@ static void VM_DrawPolygonCallback (const entity_render_t *ent, const rtlight_t
        R_Mesh_ResetTextureState();
        R_EntityMatrix(&identitymatrix);
        GL_CullFace(GL_NONE);
-       R_Mesh_VertexPointer(polys->data_vertex3f, 0, 0);
-       R_Mesh_ColorPointer(polys->data_color4f, 0, 0);
-       R_Mesh_TexCoordPointer(0, 2, polys->data_texcoord2f, 0, 0);
+       R_Mesh_PrepareVertices_Generic_Arrays(polys->num_vertices, polys->data_vertex3f, polys->data_color4f, polys->data_texcoord2f);
 
        for (surfacelistindex = 0;surfacelistindex < numsurfaces;)
        {
@@ -2966,7 +2957,7 @@ static void VM_DrawPolygonCallback (const entity_render_t *ent, const rtlight_t
                        VectorCopy(polys->data_triangles[surfacelist[surfacelistindex]].elements, polys->data_sortedelement3s + 3*numtriangles);
                        numtriangles++;
                }
-               R_Mesh_Draw(0, polys->num_vertices, 0, numtriangles, NULL, polys->data_sortedelement3s, 0, 0);
+               R_Mesh_Draw(0, polys->num_vertices, 0, numtriangles, NULL, NULL, 0, polys->data_sortedelement3s, NULL, 0);
        }
 }
 
@@ -4213,7 +4204,7 @@ VM_CL_setlistener,                                // #351 void(vector origin, vector forward, vector right,
 VM_CL_registercmd,                             // #352 void(string cmdname) registercommand (EXT_CSQC)
 VM_wasfreed,                                   // #353 float(entity ent) wasfreed (EXT_CSQC) (should be availabe on server too)
 VM_CL_serverkey,                               // #354 string(string key) serverkey (EXT_CSQC)
-NULL,                                                  // #355
+VM_CL_videoplaying,                            // #355
 NULL,                                                  // #356
 NULL,                                                  // #357
 NULL,                                                  // #358