Elric rewrote the makefile, it is quite self explanatory when run.

[xonotic/darkplaces.git] / cl_video.c

diff --git a/cl_video.c b/cl_video.c
index 58f367f4a60fcc2bb5a0c2403d062c8be5c7e9c1..857d5d8fb85bba8cc477c04cab432d7c21ae6c4c 100644 (file)
--- a/cl_video.c
+++ b/cl_video.c
@@ -59,7 +59,7 @@ void CL_VideoFrame(void)
                Con_Printf("%i = S_RawSamples_QueueWantsMore()\n", samples);
 
                // calculate how much source data we need to fill the output...
-               s = samples * cl_videosoundrate / shm->speed;
+               s = samples * cl_videosoundrate / S_RawSamples_SampleRate();
 
                // reallocate processing buffer if needed
                if (cl_videosoundresamplelength < samples)
@@ -116,7 +116,7 @@ void CL_DrawVideo(void)
                vertices[ 8] = x2;vertices[ 9] = y2;vertices[10] = 0;vertices[11] = 0;
                vertices[12] = x1;vertices[13] = y2;vertices[14] = 0;vertices[15] = 0;
                mesh.texture = cl_videotexture;
-               mesh.numindices = 6;
+               mesh.numtriangles = 2;
                mesh.numvertices = 4;
                mesh.indices = indices;
                mesh.vertices = vertices;