no longer sends moves if time is not moving forward, except when paused (this fixes...

[xonotic/darkplaces.git] / cl_video.c

diff --git a/cl_video.c b/cl_video.c
index bc226e46e8bcfb2b48861f482ee2cca82fab518a..42c0496d679026ff9e5229329b32cd27bd6321cc 100644 (file)
--- a/cl_video.c
+++ b/cl_video.c
@@ -72,11 +72,11 @@ static qboolean WakeVideo( clvideo_t * video )
 
 static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char *name, int owner )
 {
-       strncpy( video->filename, filename, MAX_QPATH );
+       strlcpy( video->filename, filename, sizeof(video->filename) );
        video->ownertag = owner;
        if( strncmp( name, CLVIDEOPREFIX, sizeof( CLVIDEOPREFIX ) - 1 ) )
                return NULL;
-       strncpy( video->cpif.name, name, MAX_QPATH );
+       strlcpy( video->cpif.name, name, sizeof(video->cpif.name) );
 
        if( !OpenStream( video ) )
                return NULL;
@@ -276,6 +276,16 @@ void CL_VideoStart(char *filename)
        CL_RestartVideo( cl_videos );
 }
 
+void CL_Video_KeyEvent( int key, int ascii, qboolean down ) 
+{
+       // only react to up events, to allow the user to delay the abortion point if it suddenly becomes interesting..
+       if( !down ) {
+               if( key == K_ESCAPE || key == K_ENTER || key == K_SPACE ) {
+                       CL_VideoStop();
+               }
+       }
+}
+
 void CL_VideoStop(void)
 {
        cl_videoplaying = false;