feat(movie): Implement ESC button mapping to skip Compaign and Challenge intro videos

Author: xezon

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

@@ -63,12 +63,12 @@ class LoadScreen
 	virtual void update( Int percent ); ///< Update the state of the slider bars
 	virtual void processProgress(Int playerId, Int percentage) = 0;
 	virtual void setProgressRange( Int min, Int max ) = 0;
+
 protected:
 	void setLoadScreen( GameWindow *g ) { m_loadScreen = g; }
-	GameWindow *m_loadScreen;		///< The GameWindow that is our loadscreen
-
-private:
+	static Bool canSkipVideo();
 
+	GameWindow *m_loadScreen;		///< The GameWindow that is our loadscreen
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////

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

@@ -71,6 +71,7 @@
 #include "GameClient/GameText.h"
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/GameWindowTransitions.h"
+#include "GameClient/Keyboard.h"
 #include "GameClient/LoadScreen.h"
 #include "GameClient/MapUtil.h"
 #include "GameClient/Mouse.h"
@@ -170,6 +171,22 @@ void LoadScreen::update( Int percent )
 	setFPMode();
 }
 
+Bool LoadScreen::canSkipVideo()
+{
+	if (TheKeyboard != NULL)
+	{
+		TheKeyboard->UPDATE();
+		for (KeyboardIO *key = TheKeyboard->getFirstKey(); key->key != KEY_NONE; ++key)
+		{
+			if (key->key == KEY_ESC && BitIsSet(key->state, KEY_STATE_UP))
+			{
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 
 // SinglePlayerLoadScreen Class ///////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -533,6 +550,10 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 		Int shiftedPercent = -FRAME_FUDGE_ADD + 1;
 		while (m_videoStream->frameIndex() < m_videoStream->frameCount() - 1 )
 		{
+			// TheSuperHackers @feature User can now skip video by pressing ESC
+			if (canSkipVideo())
+				break;
+
 			TheGameEngine->serviceWindowsOS();
 
 			if(!m_videoStream->isFrameReady())
@@ -1053,6 +1074,10 @@ void ChallengeLoadScreen::init( GameInfo *game )
 		Int shiftedPercent = -FRAME_FUDGE_ADD + 1;
 		while (m_videoStream->frameIndex() < m_videoStream->frameCount() - 1 )
 		{
+			// TheSuperHackers @feature User can now skip video by pressing ESC
+			if (canSkipVideo())
+				break;
+
 			TheGameEngine->serviceWindowsOS();
 
 			if(!m_videoStream->isFrameReady())