Simplify isVideoPlaying to remove overengineered frameIndex check

bobtista · bobtista · commit 150a8b6b3e1e · 2025-11-25T11:37:25.000-05:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
@@ -196,9 +196,7 @@ SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )
 
 Bool SinglePlayerLoadScreen::isVideoPlaying( void ) const
 {
-	return m_videoStream != NULL 
-		&& m_videoBuffer != NULL 
-		&& m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;
+	return m_videoStream != NULL && m_videoBuffer != NULL;
 }
 
 void SinglePlayerLoadScreen::skipVideo( void )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
@@ -218,9 +218,7 @@ SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )
 
 Bool SinglePlayerLoadScreen::isVideoPlaying( void ) const
 {
-	return m_videoStream != NULL 
-		&& m_videoBuffer != NULL 
-		&& m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;
+	return m_videoStream != NULL && m_videoBuffer != NULL;
 }
 
 void SinglePlayerLoadScreen::skipVideo( void )
@@ -759,9 +757,7 @@ ChallengeLoadScreen::~ChallengeLoadScreen( void )
 
 Bool ChallengeLoadScreen::isVideoPlaying( void ) const
 {
-	return m_videoStream != NULL 
-		&& m_videoBuffer != NULL 
-		&& m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;
+	return m_videoStream != NULL && m_videoBuffer != NULL;
 }
 
 void ChallengeLoadScreen::skipVideo( void )

Original file line number	Diff line number	Diff line change
`@@ -196,9 +196,7 @@ SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )`
`196`	`196`
`197`	`197`	`Bool SinglePlayerLoadScreen::isVideoPlaying( void ) const`
`198`	`198`	`{`
`199`		`- return m_videoStream != NULL`
`200`		`- && m_videoBuffer != NULL`
`201`		`- && m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;`
	`199`	`+ return m_videoStream != NULL && m_videoBuffer != NULL;`
`202`	`200`	`}`
`203`	`201`
`204`	`202`	`void SinglePlayerLoadScreen::skipVideo( void )`
Original file line number	Diff line number	Diff line change
`@@ -218,9 +218,7 @@ SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )`
`218`	`218`
`219`	`219`	`Bool SinglePlayerLoadScreen::isVideoPlaying( void ) const`
`220`	`220`	`{`
`221`		`- return m_videoStream != NULL`
`222`		`- && m_videoBuffer != NULL`
`223`		`- && m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;`
	`221`	`+ return m_videoStream != NULL && m_videoBuffer != NULL;`
`224`	`222`	`}`
`225`	`223`
`226`	`224`	`void SinglePlayerLoadScreen::skipVideo( void )`
`@@ -759,9 +757,7 @@ ChallengeLoadScreen::~ChallengeLoadScreen( void )`
`759`	`757`
`760`	`758`	`Bool ChallengeLoadScreen::isVideoPlaying( void ) const`
`761`	`759`	`{`
`762`		`- return m_videoStream != NULL`
`763`		`- && m_videoBuffer != NULL`
`764`		`- && m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;`
	`760`	`+ return m_videoStream != NULL && m_videoBuffer != NULL;`
`765`	`761`	`}`
`766`	`762`
`767`	`763`	`void ChallengeLoadScreen::skipVideo( void )`