bugfix(movie): Fix Campaign, Challenge, Score movie cancellation or decompression artifacts when tabbing out of the game (#1927)

Author: xezon

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp

@@ -633,6 +633,9 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 		return;
 	}
 
+	// TheSuperHackers @bugfix Originally this movie render loop stopped rendering when the game window was inactive.
+	// This either skipped the movie or caused decompression artifacts. Now the video just keeps playing until it done.
+
 	GameWindow *movieWindow = s_blankLayout->getFirstWindow();
 	TheWritableGlobalData->m_loadScreenRender = TRUE;
 	while (videoStream->frameIndex() < videoStream->frameCount() - 1)
@@ -645,13 +648,6 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 			continue;
 		}
 
-		if (!TheGameEngine->isActive())
-		{	//we are alt-tabbed out, so just increment the frame
-			videoStream->frameNext();
-			videoStream->frameDecompress();
-			continue;
-		}
-
 		videoStream->frameDecompress();
 		videoStream->frameRender(videoBuffer);
 		videoStream->frameNext();

Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

@@ -483,6 +483,9 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 
 	if(TheGameLODManager && TheGameLODManager->didMemPass())
 	{
+		// TheSuperHackers @bugfix Originally this movie render loop stopped rendering when the game window was inactive.
+		// This either skipped the movie or caused decompression artifacts. Now the video just keeps playing until it done.
+
 		Int progressUpdateCount = m_videoStream->frameCount() / FRAME_FUDGE_ADD;
 		Int shiftedPercent = -FRAME_FUDGE_ADD + 1;
 		while (m_videoStream->frameIndex() < m_videoStream->frameCount() - 1 )
@@ -495,13 +498,6 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 				continue;
 			}
 
-			if (!TheGameEngine->isActive())
-			{	//we are alt-tabbed out, so just increment the frame
-				m_videoStream->frameNext();
-				m_videoStream->frameDecompress();
-				continue;
-			}
-
 			m_videoStream->frameDecompress();
 			m_videoStream->frameRender(m_videoBuffer);
 			moveWindows( m_videoStream->frameIndex());

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp

@@ -727,6 +727,9 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 		return;
 	}
 
+	// TheSuperHackers @bugfix Originally this movie render loop stopped rendering when the game window was inactive.
+	// This either skipped the movie or caused decompression artifacts. Now the video just keeps playing until it done.
+
 	GameWindow *movieWindow = s_blankLayout->getFirstWindow();
 	TheWritableGlobalData->m_loadScreenRender = TRUE;
 	while (videoStream->frameIndex() < videoStream->frameCount() - 1)
@@ -739,13 +742,6 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 			continue;
 		}
 
-		if (!TheGameEngine->isActive())
-		{	//we are alt-tabbed out, so just increment the frame
-			videoStream->frameNext();
-			videoStream->frameDecompress();
-			continue;
-		}
-
 		videoStream->frameDecompress();
 		videoStream->frameRender(videoBuffer);
 		videoStream->frameNext();

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

@@ -526,6 +526,9 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 
 	if(TheGameLODManager && TheGameLODManager->didMemPass())
 	{
+		// TheSuperHackers @bugfix Originally this movie render loop stopped rendering when the game window was inactive.
+		// This either skipped the movie or caused decompression artifacts. Now the video just keeps playing until it done.
+
 		Int progressUpdateCount = m_videoStream->frameCount() / FRAME_FUDGE_ADD;
 		Int shiftedPercent = -FRAME_FUDGE_ADD + 1;
 		while (m_videoStream->frameIndex() < m_videoStream->frameCount() - 1 )
@@ -538,15 +541,6 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 				continue;
 			}
 
-			if (!TheGameEngine->isActive())
-			{/*	//we are alt-tabbed out, so just increment the frame
-				m_videoStream->frameNext();
-				m_videoStream->frameDecompress();*/
-
-				//Changing for MissionDisk, just skip to end.
-				break;
-			}
-
 			m_videoStream->frameDecompress();
 			m_videoStream->frameRender(m_videoBuffer);
 
@@ -1046,6 +1040,9 @@ void ChallengeLoadScreen::init( GameInfo *game )
 
 	if(TheGameLODManager && TheGameLODManager->didMemPass())
 	{
+		// TheSuperHackers @bugfix Originally this movie render loop stopped rendering when the game window was inactive.
+		// This either skipped the movie or caused decompression artifacts. Now the video just keeps playing until it done.
+
 		Int progressUpdateCount = m_videoStream->frameCount() / FRAME_FUDGE_ADD;
 		Int shiftedPercent = -FRAME_FUDGE_ADD + 1;
 		while (m_videoStream->frameIndex() < m_videoStream->frameCount() - 1 )
@@ -1058,13 +1055,6 @@ void ChallengeLoadScreen::init( GameInfo *game )
 				continue;
 			}
 
-			if (!TheGameEngine->isActive())
-			{	//we are alt-tabbed out, so just increment the frame
-				m_videoStream->frameNext();
-				m_videoStream->frameDecompress();
-				continue;
-			}
-
 			m_videoStream->frameDecompress();
 			m_videoStream->frameRender(m_videoBuffer);
 			m_videoStream->frameNext();