Skip to content

Commit e3b8511

Browse files
committed
fix: sync GeneralsMD LoadScreen base class and remove accidental Generals GameClient.cpp changes
1 parent 905430c commit e3b8511

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,7 @@ void GameClient::update( void )
568568
{
569569
TheKeyboard->UPDATE();
570570
TheKeyboard->createStreamMessages();
571+
571572
}
572573

573574
// Update the Eva stuff

GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class LoadScreen
6363
virtual void update( Int percent ); ///< Update the state of the slider bars
6464
virtual void processProgress(Int playerId, Int percentage) = 0;
6565
virtual void setProgressRange( Int min, Int max ) = 0;
66-
virtual Bool skipVideo( void ) { return FALSE; }
66+
virtual Bool skipVideo( void ) = 0;
6767
protected:
6868
void setLoadScreen( GameWindow *g ) { m_loadScreen = g; }
6969
GameWindow *m_loadScreen; ///< The GameWindow that is our loadscreen

0 commit comments

Comments
 (0)