Added online help option if updater download fails.

Fixed FileLoad return value.
Modified server announce error message.

Author: ccw808

MTA10/core/CQuestionBox.cpp

@@ -195,6 +195,18 @@ void CQuestionBox::SetCallbackEdit ( pfnQuestionEditCallback callback, void* ptr
 }
 
 
+// Call after the main message has been set
+void CQuestionBox::SetOnLineHelpOption( const SString& strTroubleLink )
+{
+    SString strMessage = "\n\n";
+    strMessage += _("Do you want to see some on-line help about this problem ?");
+    AppendMessage( strMessage );
+    SetButton( 0, _("No") );
+    SetButton( 1, _("Yes") );
+    SetCallback( CCore::ErrorMessageBoxCallBack, new SString( strTroubleLink ) );
+}
+
+
 unsigned int CQuestionBox::PollButtons ( void )
 {
     if ( !m_pWindow->IsVisible () )

MTA10/core/CQuestionBox.h

@@ -38,6 +38,7 @@ class CQuestionBox
     CGUIEdit*           SetEditbox                  ( unsigned int uiEditbox, const SString& strText );
     void                SetCallback                 ( pfnQuestionCallback callback, void* ptr = NULL );
     void                SetCallbackEdit             ( pfnQuestionEditCallback callback, void* ptr = NULL );
+    void                SetOnLineHelpOption         ( const SString& strTroubleType );
     unsigned int        PollButtons                 ( void );
     bool                IsVisible                   ( void );
     void                SetAutoCloseOnConnect       ( bool bEnable );

MTA10/core/CVersionUpdater.cpp

@@ -1760,8 +1760,13 @@ void CVersionUpdater::_PollAnyButton ( void )
     while( true )
     {
         UpdaterYield();
+
+        // Abort if external force has closed the question box
+        if ( !GetQuestionBox ().IsVisible () )
+            _QuitCurrentProgram();
+
         // Wait for button press before continuing
-        if ( GetQuestionBox ().PollButtons () != -1 )
+        if ( GetQuestionBox ().PollButtons () != BUTTON_NONE )
         {
             GetQuestionBox ().Reset ();
             return;
@@ -1782,6 +1787,11 @@ void CVersionUpdater::_PollQuestionNoYes ( void )
     while( true )
     {
         UpdaterYield();
+
+        // Abort if external force has closed the question box
+        if ( !GetQuestionBox ().IsVisible () )
+            _QuitCurrentProgram();
+
         switch ( GetQuestionBox ().PollButtons () )
         {
             case BUTTON_NONE:
@@ -1982,7 +1992,7 @@ void CVersionUpdater::_DialogUpdateResult(void)
             GetQuestionBox ().Reset ();
             GetQuestionBox ().SetTitle ( _("ERROR DOWNLOADING") );
             GetQuestionBox ().SetMessage ( _("The downloaded file appears to be incorrect.") );
-            GetQuestionBox ().SetButton ( 0, _("OK") );
+            GetQuestionBox ().SetOnLineHelpOption ( SString( "dl-incorrect&fname=%s", *m_JobInfo.strFilename )  );
             GetQuestionBox ().Show ();
             _PollAnyButton();
         }
@@ -2591,7 +2601,7 @@ void CVersionUpdater::_ProcessPatchFileDownload ( void )
             if ( m_JobInfo.serverList.size () )
                 ListRemoveIndex( m_JobInfo.serverList, m_JobInfo.iCurrent-- );
             m_ConditionMap.SetCondition ( "Download", "Fail", "Checksum" );
-            AddReportLog ( 5003, SString ( "DoPollDownload: Checksum wrong for %s (%s %s)", m_JobInfo.strFilename.c_str(), m_JobInfo.strMD5.c_str(), szMD5 ) );
+            AddReportLog ( 5003, SString ( "DoPollDownload: Checksum wrong for %s (Want:%d-%s Got:%d-%s)", m_JobInfo.strFilename.c_str(), (int)m_JobInfo.iFilesize, m_JobInfo.strMD5.c_str(), uiSize, szMD5 ) );
             return;
         }
     }
@@ -2771,7 +2781,7 @@ int CVersionUpdater::_PollDownload ( void )
                 if ( GetQuestionBox ().IsVisible () )
                 {
                     // Handle progress/cancel if visible
-                    if ( GetQuestionBox ().PollButtons () == 0 )
+                    if ( GetQuestionBox ().PollButtons () == BUTTON_0 )
                     {
                         GetHTTP()->Reset();
                         GetQuestionBox ().Reset ();

MTA10_Server/mods/deathmatch/utils/CMasterServerAnnouncer.h

@@ -78,7 +78,7 @@ class CMasterServer : public CRefCountable
                 // Send request
                 this->AddRef();     // Keep object alive
                 m_bStatusBusy = true;
-                GetDownloadManager()->QueueFile( m_Definition.strURL, NULL, 0, "", 0, false, this, StaticProgressCallback, false, 1 );
+                GetDownloadManager()->QueueFile( m_Definition.strURL, NULL, 0, "", 0, false, this, StaticProgressCallback, false, 2 );
             }
         }
         else
@@ -153,7 +153,7 @@ class CMasterServer : public CRefCountable
                     if ( !m_Definition.bHideProblems )
                     {
                         // Log initial failure
-                        CLogger::LogPrintf( "%s problem (%u). Retrying...\n", *m_Definition.strDesc, iError );
+                        CLogger::LogPrintf( "%s no response. Retrying...\n", *m_Definition.strDesc );
                     }
                 }
             }

Shared/sdk/SharedUtil.File.hpp

@@ -111,10 +111,11 @@ bool SharedUtil::FileLoad ( const SString& strFilename, std::vector < char >& bu
     // Get size
     fseek ( fh, 0, SEEK_END );
     int size = ftell ( fh );
-    rewind ( fh );
 
     // Set offset
+    iOffset = Min ( iOffset, size );
     fseek ( fh, iOffset, SEEK_SET );
+    size -= iOffset;
 
     int bytesRead = 0;
     if ( size > 0 && size < 1e9 )   // 1GB limit
@@ -448,8 +449,8 @@ uint SharedUtil::GetPathFreeSpaceMB( const SString& strPath )
 
 SString SharedUtil::GetDriveNameWithNotEnoughSpace( uint uiResourcesPathMinMB, uint uiDataPathMinMB )
 {
-    SString strFileCachePath = GetCommonRegistryValue( "", "File Cache Path" );
-    if ( !strFileCachePath.empty() && DirectoryExists( PathJoin( strFileCachePath, "resources" ) ) )
+    SString strFileCachePath = GetCommonRegistryValue( "", "File Cache Path" );
+    if ( !strFileCachePath.empty() && DirectoryExists( PathJoin( strFileCachePath, "resources" ) ) )
         if ( GetPathFreeSpaceMB( strFileCachePath ) < uiResourcesPathMinMB )
             return GetPathDriveName( strFileCachePath );