Skip to content

Commit 8548221

Browse files
committed
Combine TheKeyboard and TheMessageStream conditions in GeneralsMD
1 parent bfe0bea commit 8548221

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

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

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

574573
// Update the Eva stuff

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -552,14 +552,12 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
552552
{
553553
TheGameEngine->serviceWindowsOS();
554554

555-
if( TheKeyboard )
555+
if( TheKeyboard && TheMessageStream )
556556
{
557557
TheKeyboard->UPDATE();
558558
TheKeyboard->createStreamMessages();
559-
}
560-
561-
if( TheMessageStream )
562559
TheMessageStream->propagateMessages();
560+
}
563561

564562
if(!m_videoStream->isFrameReady())
565563
{

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,6 @@ void GameClient::update( void )
593593
{
594594
TheKeyboard->UPDATE();
595595
TheKeyboard->createStreamMessages();
596-
597596
}
598597

599598
// Update the Eva stuff
@@ -604,7 +603,6 @@ void GameClient::update( void )
604603
{
605604
TheMouse->UPDATE();
606605
TheMouse->createStreamMessages();
607-
608606
}
609607

610608

0 commit comments

Comments
 (0)