allow version switch on briefing screen

Author: segrax

Source/Briefing.cpp

@@ -395,8 +395,11 @@ int16 cFodder::Briefing_Show() {
 	if (mVersionCurrent->isDemo() && mVersionDefault->isDemo())
 		return 1;
 
+
 	// Show the Briefing screen for Retail and Custom 
 	if (mVersionCurrent->hasBriefingScreen() || mCustom_Mode != eCustomMode_None || mGame_Data.mCampaign.isRandom()) {
+        
+        mBriefing_Screen_Active = true;
 
 		Window_UpdateScreenSize();
 
@@ -417,6 +420,8 @@ int16 cFodder::Briefing_Show() {
 		// Needs to split into cycle function
 		Briefing_Show_Ready();
 
+        mBriefing_Screen_Active = false;
+
 		// Aborted?
 		if (mBriefing_Aborted == -1) {
 

Source/Fodder.cpp

@@ -156,10 +156,12 @@ cFodder::cFodder(std::shared_ptr<cWindow> pWindow)
     Squad_Walk_Target_SetAll(0);
     mPhase_Completed_Timer = 0;
     mVideo_Draw_ColumnsMax = 0;
+
+    mBriefing_Screen_Active = false;
     mBriefingHelicopter_DirectionIndexF = 0;
     mBriefingHelicopter_DirectionIndex = 0;
     mBriefingHelicopter_Speed = 0;
-    word_428BA = 0;
+
     mHelicopterPosX = 0;
     mHelicopterPosY = 0;
     mBriefingHelicopter_TargetDirection = 0;
@@ -1058,6 +1060,8 @@ void cFodder::Phase_EngineReset()
     word_3B4ED[1] = 0;
     mPhase_Finished = false;
     mImage_Aborted = 0;
+
+    mBriefing_Screen_Active = false;
     mBriefing_Aborted = 0;
     mHostage_Rescue_Tent = 0;
 
@@ -2368,6 +2372,15 @@ void cFodder::VersionSwitch(const sGameVersion *pVersion)
         if (!mStartParams->mDisableSound)
             Music_Play(0);
     }
+
+    if (mBriefing_Screen_Active && mVersionCurrent->hasBriefingScreen())
+    {
+        Briefing_Show_PreReady();
+        Briefing_Draw_Mission_Title(0x2C);
+        Briefing_Draw_Phase();
+        Briefing_Draw_With();
+        mSurface->Save();
+    }
 }
 
 int16 cFodder::getWindowWidth() const

Source/Fodder.hpp

@@ -544,15 +544,15 @@ class cFodder {
     size_t          mDraw_Dest_SkipPixelsPerRow;
     uint16          mVideo_Draw_ColumnsMax;
 
+    bool            mBriefing_Screen_Active;
     int32           mBriefingHelicopter_ScreenX;
     int32           mBriefingHelicopter_ScreenY;
     int16           mBriefingHelicopter_DirectionIndex;
     float           mBriefingHelicopter_DirectionIndexF;
     float           mBriefingHelicopter_Speed;
-    int16          word_428BA;
 
-    float          mHelicopterPosX;
-    float          mHelicopterPosY;
+    float           mHelicopterPosX;
+    float           mHelicopterPosY;
     int16           mBriefingHelicopter_TargetDirection;
     float           mBriefingHelicopter_TargetSpeed;        // 50Hz Ticks
     float           mBriefingHelicopter_NextUpdateCountdown;