Add GameLogic::skipLoadScreen method to prevent direct LoadScreen access

Author: bobtista

Generals/Code/GameEngine/Include/GameLogic/GameLogic.h

@@ -158,6 +158,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	void updateLoadProgress( Int progress );
 	void deleteLoadScreen( void );
 	LoadScreen *getLoadScreen( void ) const { return m_loadScreen; }
+	Bool skipLoadScreen( void );
 
 	void setGameLoading( Bool loading );
 	void setGameMode( GameMode mode );

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

@@ -55,7 +55,6 @@
 #include "GameClient/Shell.h"
 #include "GameClient/Display.h"
 #include "GameLogic/GameLogic.h"
-#include "GameClient/LoadScreen.h"
 
 
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -316,14 +315,9 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 				&& (key == KEY_ESC)
 				&& (BitIsSet( state, KEY_STATE_UP )) )
 			{
-				if( TheGameLogic )
+				if( TheGameLogic && TheGameLogic->skipLoadScreen() )
 				{
-					LoadScreen *loadScreen = TheGameLogic->getLoadScreen();
-					if( loadScreen && loadScreen->isVideoPlaying() )
-					{
-						loadScreen->skipVideo();
-						returnCode = WIN_INPUT_USED;
-					}
+					returnCode = WIN_INPUT_USED;
 				}
 			}
 

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

@@ -980,6 +980,19 @@ void GameLogic::deleteLoadScreen( void )
 
 }
 
+// ------------------------------------------------------------------------------------------------
+/** Skip the load screen video if one is playing */
+// ------------------------------------------------------------------------------------------------
+Bool GameLogic::skipLoadScreen( void )
+{
+	if( m_loadScreen && m_loadScreen->isVideoPlaying() )
+	{
+		m_loadScreen->skipVideo();
+		return TRUE;
+	}
+	return FALSE;
+}
+
 void GameLogic::setGameLoading( Bool loading )
 {
 	m_loadingScene = loading;

GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h

@@ -163,6 +163,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	void updateLoadProgress( Int progress );
 	void deleteLoadScreen( void );
 	LoadScreen *getLoadScreen( void ) const { return m_loadScreen; }
+	Bool skipLoadScreen( void );
 
 	//Kris: Cut setGameLoading() and replaced with setLoadingMap() and setLoadingSave() -- reason: nomenclature
 	//void setGameLoading( Bool loading ) { m_loadingScene = loading; }

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

@@ -55,7 +55,6 @@
 #include "GameClient/Shell.h"
 #include "GameClient/Display.h"
 #include "GameLogic/GameLogic.h"
-#include "GameClient/LoadScreen.h"
 
 
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -333,14 +332,9 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 				&& (key == KEY_ESC)
 				&& (BitIsSet( state, KEY_STATE_UP )) )
 			{
-				if( TheGameLogic )
+				if( TheGameLogic && TheGameLogic->skipLoadScreen() )
 				{
-					LoadScreen *loadScreen = TheGameLogic->getLoadScreen();
-					if( loadScreen && loadScreen->isVideoPlaying() )
-					{
-						loadScreen->skipVideo();
-						returnCode = WIN_INPUT_USED;
-					}
+					returnCode = WIN_INPUT_USED;
 				}
 			}
 

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

@@ -1122,6 +1122,19 @@ void GameLogic::deleteLoadScreen( void )
 
 }
 
+// ------------------------------------------------------------------------------------------------
+/** Skip the load screen video if one is playing */
+// ------------------------------------------------------------------------------------------------
+Bool GameLogic::skipLoadScreen( void )
+{
+	if( m_loadScreen && m_loadScreen->isVideoPlaying() )
+	{
+		m_loadScreen->skipVideo();
+		return TRUE;
+	}
+	return FALSE;
+}
+
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void GameLogic::updateDisplayBusyState()