now uses getsockname to find out what address/port a newly opened socket is at, so...

[xonotic/darkplaces.git] / cl_video.c

diff --git a/cl_video.c b/cl_video.c
index a309b2e49288b9e9999e847d6d4c54691cdc9536..c6c094c365995c03bd292ffa81f83dca56c4b5ba 100644 (file)
--- a/cl_video.c
+++ b/cl_video.c
@@ -103,18 +103,18 @@ void CL_DrawVideo(void)
                texcoord2f[2] = s2;texcoord2f[3] = t1;
                texcoord2f[4] = s2;texcoord2f[5] = t2;
                texcoord2f[6] = s1;texcoord2f[7] = t2;
-               R_FillColors(color4f, 4, r_colorscale, r_colorscale, r_colorscale, 1);
+               R_FillColors(color4f, 4, 1, 1, 1, 1);
                vertex3f[ 0] = x1;vertex3f[ 1] = y1;vertex3f[ 2] = 0;
                vertex3f[ 3] = x2;vertex3f[ 4] = y1;vertex3f[ 5] = 0;
                vertex3f[ 6] = x2;vertex3f[ 7] = y2;vertex3f[ 8] = 0;
                vertex3f[ 9] = x1;vertex3f[10] = y2;vertex3f[11] = 0;
                mesh.texture = cl_videotexture;
-               mesh.numtriangles = 2;
-               mesh.numvertices = 4;
-               mesh.element3i = polygonelements;
-               mesh.vertex3f = vertex3f;
-               mesh.texcoord2f = texcoord2f;
-               mesh.color4f = color4f;
+               mesh.num_triangles = 2;
+               mesh.num_vertices = 4;
+               mesh.data_element3i = polygonelements;
+               mesh.data_vertex3f = vertex3f;
+               mesh.data_texcoord2f = texcoord2f;
+               mesh.data_color4f = color4f;
                DrawQ_Mesh(&mesh, 0);
                //DrawQ_Pic(0, 0, "engine_videoframe", vid.conwidth, vid.conheight, 1, 1, 1, 1, 0);
        }
@@ -189,11 +189,11 @@ static void CL_PlayVideo_f(void)
 
        if (Cmd_Argc() != 2)
        {
-               Con_Printf ("usage: playvideo <videoname>\nplays video named video/<videoname>.dpv\n");
+               Con_Print("usage: playvideo <videoname>\nplays video named video/<videoname>.dpv\n");
                return;
        }
 
-       sprintf(name, "%s/video/%s.dpv", fs_gamedir, Cmd_Argv(1));
+       sprintf(name, "video/%s.dpv", Cmd_Argv(1));
        CL_VideoStart(name);
 }