Update splash window

Author: botder

Client/core/CCore.cpp

@@ -1233,71 +1233,51 @@ void CCore::DoPostFramePulse()
         m_pGUI->SelectInputHandlers(INPUT_CORE);
     }
 
-    if (m_pGame->GetSystemState() == 5)            // GS_INIT_ONCE
-    {
-        WatchDogCompletedSection("L2");            // gta_sa.set seems ok
-        WatchDogCompletedSection("L3");            // No hang on startup
-    }
-
     // This is the first frame in the menu?
     if (m_pGame->GetSystemState() == 7)            // GS_FRONTEND
     {
-        // Wait 250 frames more than the time it took to get status 7 (fade-out time)
-        static short WaitForMenu = 0;
+        if (m_bFirstFrame)
+        {
+            m_bFirstFrame = false;
 
-        // Do crash dump encryption while the credit screen is displayed
-        if (WaitForMenu == 0)
+            WatchDogCompletedSection("L2");            // gta_sa.set seems ok
+            WatchDogCompletedSection("L3");            // No hang on startup
             HandleCrashDumpEncryption();
 
-        // Cope with early finish
-        if (m_pGame->HasCreditScreenFadedOut())
-            WaitForMenu = 250;
+            // Disable vsync while it's all dark
+            m_pGame->DisableVSync();
 
-        if (WaitForMenu >= 250)
-        {
-            if (m_bFirstFrame)
+            // Parse the command line
+            // Does it begin with mtasa://?
+            if (m_szCommandLineArgs && strnicmp(m_szCommandLineArgs, "mtasa://", 8) == 0)
             {
-                m_bFirstFrame = false;
-
-                // Disable vsync while it's all dark
-                m_pGame->DisableVSync();
-
-                // Parse the command line
-                // Does it begin with mtasa://?
-                if (m_szCommandLineArgs && strnicmp(m_szCommandLineArgs, "mtasa://", 8) == 0)
+                SString strArguments = GetConnectCommandFromURI(m_szCommandLineArgs);
+                // Run the connect command
+                if (strArguments.length() > 0 && !m_pCommands->Execute(strArguments))
                 {
-                    SString strArguments = GetConnectCommandFromURI(m_szCommandLineArgs);
-                    // Run the connect command
-                    if (strArguments.length() > 0 && !m_pCommands->Execute(strArguments))
-                    {
-                        ShowMessageBox(_("Error") + _E("CC41"), _("Error executing URL"), MB_BUTTON_OK | MB_ICON_ERROR);
-                    }
+                    ShowMessageBox(_("Error") + _E("CC41"), _("Error executing URL"), MB_BUTTON_OK | MB_ICON_ERROR);
                 }
-                else
+            }
+            else
+            {
+                // We want to load a mod?
+                const char* szOptionValue;
+                if (szOptionValue = GetCommandLineOption("l"))
                 {
-                    // We want to load a mod?
-                    const char* szOptionValue;
-                    if (szOptionValue = GetCommandLineOption("l"))
-                    {
-                        // Try to load the mod
-                        if (!m_pModManager->Load(szOptionValue, m_szCommandLineArgs))
-                        {
-                            SString strTemp(_("Error running mod specified in command line ('%s')"), szOptionValue);
-                            ShowMessageBox(_("Error") + _E("CC42"), strTemp, MB_BUTTON_OK | MB_ICON_ERROR);            // Command line Mod load failed
-                        }
-                    }
-                    // We want to connect to a server?
-                    else if (szOptionValue = GetCommandLineOption("c"))
+                    // Try to load the mod
+                    if (!m_pModManager->Load(szOptionValue, m_szCommandLineArgs))
                     {
-                        CCommandFuncs::Connect(szOptionValue);
+                        SString strTemp(_("Error running mod specified in command line ('%s')"), szOptionValue);
+                        ShowMessageBox(_("Error") + _E("CC42"), strTemp, MB_BUTTON_OK | MB_ICON_ERROR);            // Command line Mod load failed
                     }
                 }
+                // We want to connect to a server?
+                else if (szOptionValue = GetCommandLineOption("c"))
+                {
+                    CCommandFuncs::Connect(szOptionValue);
+                }
             }
         }
-        else
-        {
-            WaitForMenu++;
-        }
 
         if (m_bWaitToSetNick && GetLocalGUI()->GetMainMenu()->IsVisible() && !GetLocalGUI()->GetMainMenu()->IsFading())
         {

Client/core/CGUI.cpp

@@ -158,7 +158,8 @@ void CLocalGUI::CreateWindows(bool bGameIsAlreadyLoaded)
     m_pLabelVersionTag->SetTextColor(255, 255, 255);
     m_pLabelVersionTag->SetZOrderingEnabled(false);
     m_pLabelVersionTag->MoveToBack();
-    m_pLabelVersionTag->SetVisible(false);
+    if (MTASA_VERSION_TYPE < VERSION_TYPE_RELEASE)
+        m_pLabelVersionTag->SetAlwaysOnTop(true);
 
     // Create mainmenu
     m_pMainMenu = new CMainMenu(pGUI);
@@ -286,27 +287,6 @@ void CLocalGUI::Draw()
     // Update mainmenu stuff
     m_pMainMenu->Update();
 
-    // Make sure our version labels are always visible
-    static short WaitForMenu = 0;
-
-    // Cope with early finish
-    if (pGame->HasCreditScreenFadedOut())
-        WaitForMenu = 250;
-
-    if (SystemState == 7 || SystemState == 9)
-    {
-        if (WaitForMenu < 250)
-        {
-            WaitForMenu++;
-        }
-        else
-        {
-            m_pLabelVersionTag->SetVisible(true);
-            if (MTASA_VERSION_TYPE < VERSION_TYPE_RELEASE)
-                m_pLabelVersionTag->SetAlwaysOnTop(true);
-        }
-    }
-
     // If we're ingame, make sure the chatbox is drawn
     bool bChatVisible = (SystemState == 9 /* GS_INGAME */ && m_pMainMenu->GetIsIngame() && m_bChatboxVisible && !CCore::GetSingleton().IsOfflineMod());
     if (m_pChat->IsVisible() != bChatVisible)

Client/core/CMainMenu.cpp

@@ -48,7 +48,6 @@
 #define CORE_MTA_FILLER             "cgui\\images\\mta_filler.png"
 #define CORE_MTA_VERSION            "cgui\\images\\version.png"
 
-static int          WaitForMenu = 0;
 static const SColor headlineColors[] = {SColorRGBA(233, 234, 106, 255), SColorRGBA(233 / 6 * 4, 234 / 6 * 4, 106 / 6 * 4, 255),
                                         SColorRGBA(233 / 7 * 3, 234 / 7 * 3, 106 / 7 * 3, 255)};
 
@@ -70,11 +69,10 @@ CMainMenu::CMainMenu(CGUI* pManager)
 
     // Initialize
     m_pManager = pManager;
-    m_bIsVisible = false;
+    m_bIsVisible = true;
     m_bIsFullyVisible = false;
     m_bIsIngame = true;
     //    m_bIsInSubWindow = false;
-    m_bStarted = false;
     m_fFader = 0;
     m_ucFade = FADE_INVISIBLE;
     m_bCursorAlphaReset = false;
@@ -656,47 +654,22 @@ void CMainMenu::Update()
     // Force the mainmenu on if we're at GTA's mainmenu or not ingame
     if ((SystemState == 7 || SystemState == 9) && !m_bIsIngame)
     {
-        // Cope with early finish
-        if (pGame->HasCreditScreenFadedOut())
-            WaitForMenu = std::max(WaitForMenu, 250);
-
-        // Fade up
-        if (WaitForMenu >= 250)
+        if (!m_bStarted)
         {
-            m_bIsVisible = true;
             m_bStarted = true;
-        }
 
-        // Create headlines while the screen is still black
-        if (WaitForMenu == 250)
             m_pNewsBrowser->CreateHeadlines();
-
-        // Start updater after fade up is complete
-        if (WaitForMenu == 275)
             GetVersionUpdater()->EnableChecking(true);
 
-#if _WIN32_WINNT <= _WIN32_WINNT_WINXP
-        if (WaitForMenu == 275)
-        {
-            CCore::GetSingletonPtr()->ShowErrorMessageBox("", XP_VISTA_WARNING, "au-revoir-xp-vista");
-        }
-#endif
-
-        if (WaitForMenu == 299)
-        {
-            if (!g_pCore->GetCVars()->GetValue("discord_rpc_share_data_firsttime", false)
-                && g_pCore->GetCVars()->GetValue("allow_discord_rpc", false)
-                && !g_pCore->GetCVars()->GetValue("discord_rpc_share_data", false))
+            if (!g_pCore->GetCVars()->GetValue("discord_rpc_share_data_firsttime", false) && g_pCore->GetCVars()->GetValue("allow_discord_rpc", false) &&
+                !g_pCore->GetCVars()->GetValue("discord_rpc_share_data", false))
             {
                 m_Settings.ShowRichPresenceShareDataQuestionBox();
                 CVARS_SET("discord_rpc_share_data_firsttime", true);
             }
             else
                 CVARS_SET("discord_rpc_share_data_firsttime", true);
         }
-
-        if (WaitForMenu < 300)
-            WaitForMenu++;
     }
 
     // If we're visible

Client/core/CMainMenu.h

@@ -144,7 +144,7 @@ class CMainMenu
     int m_menuBY;
 
     CGraphics* m_pGraphics;
-    bool       m_bStarted;
+    bool       m_bStarted{false};
     CVector2D  m_ScreenSize;
 
     // Fade variables

Client/game_sa/CGameSA.cpp

@@ -1041,14 +1041,6 @@ void CGameSA::SetupBrokenModels()
     FixModelCol(3553, 3554);
 }
 
-// Well, has it?
-bool CGameSA::HasCreditScreenFadedOut()
-{
-    BYTE ucAlpha = *(BYTE*)0xBAB320;            // CLoadingScreen::m_FadeAlpha
-    bool bCreditScreenFadedOut = (GetSystemState() >= 7) && (ucAlpha < 6);
-    return bCreditScreenFadedOut;
-}
-
 // Ensure replaced/restored textures for models in the GTA map are correct
 void CGameSA::FlushPendingRestreamIPL()
 {

Client/game_sa/CGameSA.h

@@ -280,8 +280,6 @@ class CGameSA : public CGame
     void SuspendASyncLoading(bool bSuspend, uint uiAutoUnsuspendDelay = 0);
     bool IsASyncLoadingEnabled(bool bIgnoreSuspend = false);
 
-    bool HasCreditScreenFadedOut();
-
     void         SetupSpecialCharacters();
     void         FixModelCol(uint iFixModel, uint iFromModel);
     void         SetupBrokenModels();