Skip to content

Commit 12ab31b

Browse files
committed
refactor(video): simplify GameLogic::skipLoadScreen() to use skipVideo() return value
1 parent 0c384c9 commit 12ab31b

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -985,12 +985,7 @@ void GameLogic::deleteLoadScreen( void )
985985
// ------------------------------------------------------------------------------------------------
986986
Bool GameLogic::skipLoadScreen( void )
987987
{
988-
if( m_loadScreen && m_loadScreen->isVideoPlaying() )
989-
{
990-
m_loadScreen->skipVideo();
991-
return TRUE;
992-
}
993-
return FALSE;
988+
return m_loadScreen && m_loadScreen->skipVideo();
994989
}
995990

996991
void GameLogic::setGameLoading( Bool loading )

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,12 +1127,7 @@ void GameLogic::deleteLoadScreen( void )
11271127
// ------------------------------------------------------------------------------------------------
11281128
Bool GameLogic::skipLoadScreen( void )
11291129
{
1130-
if( m_loadScreen && m_loadScreen->isVideoPlaying() )
1131-
{
1132-
m_loadScreen->skipVideo();
1133-
return TRUE;
1134-
}
1135-
return FALSE;
1130+
return m_loadScreen && m_loadScreen->skipVideo();
11361131
}
11371132

11381133
// ------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)