]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
oops, video texture unlinking was accidentally removed, restore it
authorvortex <vortex@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 29 Oct 2010 17:54:59 +0000 (17:54 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 30 Oct 2010 08:56:18 +0000 (10:56 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10568 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=8aecffa298082cc5daaf6f8ac0a44aa9d306c832

cl_video.c

index 2d3e6d0d562b4d5c03283f9da694040713574051..e234700c68c13b8cfa90f8dd6ffa91081bf905fe 100644 (file)
@@ -62,6 +62,7 @@ static void UnlinkVideoTexture( clvideo_t *video ) {
        CL_UnlinkDynTexture( video->cpif.name );
        // free the texture
        R_FreeTexture( video->cpif.tex );
+       video->cpif.tex = NULL;
        // free the image data
        Mem_Free( video->imagedata );
 }
@@ -598,7 +599,12 @@ static void cl_video_start( void )
 
 static void cl_video_shutdown( void )
 {
-       // TODO: unlink video textures?
+       int i;
+       clvideo_t *video;
+
+       for( video = cl_videos, i = 0 ; i < cl_num_videos ; i++, video++ )
+               if( video->state != CLVIDEO_UNUSED && !video->suspended )
+                       SuspendVideo( video );
        R_FreeTexturePool( &cl_videotexturepool );
 }