Replicate in Generals

Author: xezon

Generals/Code/GameEngine/Include/Common/GlobalData.h

@@ -365,7 +365,6 @@ class GlobalData : public SubsystemInterface
 	Bool m_shellMapOn;								///< User can set the shell map not to load
 	Bool m_playIntro;									///< Flag to say if we're to play the intro or not
 	Bool m_playSizzle;								///< Flag to say whether we play the sizzle movie after the logo movie.
-	Bool m_allowExitOutOfMovies;			///< flag to allow exit out of movies only after the Intro has played
 
 	Bool m_loadScreenRender;						///< flag to disallow rendering of almost everything during a loadscreen
 

Generals/Code/GameEngine/Include/GameClient/GameClient.h

@@ -150,6 +150,8 @@ class GameClient : public SubsystemInterface,
 	UnsignedInt getRenderedObjectCount() const { return m_renderedObjectCount; }
 	void incrementRenderedObjectCount() { m_renderedObjectCount++; }
 
+	Bool skipCurrentIntroStage();
+
 	static Bool isMovieAbortRequested();
 
 protected:

Generals/Code/GameEngine/Source/Common/GlobalData.cpp

@@ -1009,7 +1009,6 @@ GlobalData::GlobalData()
 	m_shellMapOn =TRUE;
 	m_playIntro = TRUE;
 	m_playSizzle = TRUE;
-	m_allowExitOutOfMovies = FALSE;
 	m_loadScreenRender = FALSE;
 
 	m_keyboardDefaultScrollFactor = m_keyboardScrollFactor = 0.5f;

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

@@ -711,6 +711,15 @@ void GameClient::step()
 	TheDisplay->step();
 }
 
+Bool GameClient::skipCurrentIntroStage()
+{
+	if (m_intro != nullptr)
+	{
+		return m_intro->skipCurrentIntroStage();
+	}
+	return false;
+}
+
 Bool GameClient::isMovieAbortRequested()
 {
 	if (TheGameEngine)
@@ -723,7 +732,7 @@ Bool GameClient::isMovieAbortRequested()
 	{
 		TheKeyboard->UPDATE();
 		KeyboardIO *io = TheKeyboard->findKey(KEY_ESC, KeyboardIO::STATUS_UNUSED);
-		if (io && BitIsSet(io->state, KEY_STATE_DOWN))
+		if (io && BitIsSet(io->state, KEY_STATE_UP))
 		{
 			io->setUsed();
 			return TRUE;