Small tweaks incl. updated debug logging and removed unused code.

Author: ccw808

MTA10/core/CServerList.h

@@ -27,7 +27,7 @@ class CMasterServerManagerInterface;
 #include "tracking/CHTTPClient.h"
 
 // Master server list URL
-#define SERVER_LIST_MASTER_URL              "http://1mgg.com/affil/mta-1.0"
+#define SERVER_LIST_MASTER_URL              "http://master.multitheftauto.com/ase/mta/"
 
 // Query response data buffer
 #define SERVER_LIST_QUERY_BUFFER            4096

MTA10/core/CVersionUpdater.cpp

@@ -686,7 +686,7 @@ void CVersionUpdater::GetAseServerList ( std::vector < SString >& outResult )
 
     // Backup plan if list is empty
     if ( outResult.empty () )
-        outResult.push_back ( "http://1mgg.com/affil/mta" );
+        outResult.push_back ( SERVER_LIST_MASTER_URL );
 }
 
 

MTA10/loader/MainFunctions.cpp

@@ -341,13 +341,19 @@ void HandleNotUsedMainMenu ( void )
         FileLoad( strCoreConfigFilename, strCoreConfig );
         SString strWindowed        = strCoreConfig.SplitRight( "<display_windowed>" ).Left( 1 );
         SString strFullscreenStyle = strCoreConfig.SplitRight( "<display_fullscreen_style>" ).Left( 1 );
+        if ( strFullscreenStyle == "1" )
+        {
+            AddReportLog( 9315, "Loader - HandleNotUsedMainMenu - Already Borderless window" );
+            return;
+        }
         if ( !strWindowed.empty() && !strFullscreenStyle.empty())
         {
             if ( strWindowed == "0" && strFullscreenStyle == "0" )   // 0=FULLSCREEN_STANDARD
             {
                 // Inform user
                 SString strMessage = _("Are you having problems running MTA:SA?.\n\nDo you want to change the following setting?");
                 strMessage += "\n" + _("Fullscreen mode:") + " -> " + _("Borderless window");
+                HideSplash();
                 int iResponse = MessageBoxUTF8 ( NULL, strMessage, "MTA: San Andreas", MB_YESNO | MB_ICONQUESTION | MB_TOPMOST );
                 if ( iResponse == IDYES )
                 {

MTA10/mods/shared_logic/CClientDFF.cpp

@@ -118,6 +118,21 @@ void CClientDFF::UnloadDFF ( void )
 
 
 bool CClientDFF::ReplaceModel ( unsigned short usModel, bool bAlphaTransparency )
+{
+    // Record attempt in case it all goes wrong
+    CArgMap argMap;
+    argMap.Set( "id", usModel );
+    argMap.Set( "reason", "ReplaceModel" );
+    SetApplicationSetting( "diagnostics", "gta-model-fail", argMap.ToString() );
+
+    bool bResult = DoReplaceModel( usModel, bAlphaTransparency );
+
+    SetApplicationSetting( "diagnostics", "gta-model-fail", "" );
+    return bResult;
+}
+
+
+bool CClientDFF::DoReplaceModel ( unsigned short usModel, bool bAlphaTransparency )
 {
     if ( !CClientDFFManager::IsReplacableModel( usModel ) )
         return false;

MTA10/mods/shared_logic/CClientDFF.h

@@ -53,6 +53,7 @@ class CClientDFF : public CClientEntity
     void                            SetPosition             ( const CVector& vecPosition ) {};
 
 protected:
+    bool                            DoReplaceModel          ( unsigned short usModel, bool bAlphaTransparency );
     void                            UnloadDFF               ( void );
     void                            InternalRestoreModel    ( unsigned short usModel );
 

Shared/sdk/SharedUtil.Misc.h

@@ -193,7 +193,6 @@ namespace SharedUtil
     // Version string things
     bool        IsValidVersionString                ( const SString& strVersion );
     SString     ExtractVersionStringBuildNumber     ( const SString& strVersion );
-    SString     ConformVersionStringToBaseVersion   ( const SString& strVersion, const SString& strBaseVersion );
 
     //
     // Try to make a path relative to the 'resources/' directory

Shared/sdk/SharedUtil.Misc.hpp

@@ -1368,17 +1368,6 @@ SString SharedUtil::ExtractVersionStringBuildNumber( const SString& strVersion )
 }
 
 
-// Replace major/minor/type to match current configuration
-SString SharedUtil::ConformVersionStringToBaseVersion( const SString& strVersion, const SString& strBaseVersion )
-{
-    SString strResult = strVersion;
-    strResult[0] = strBaseVersion[0];  // Major
-    strResult[2] = strBaseVersion[2];  // Minor
-    strResult[6] = strBaseVersion[6];  // Type
-    return strResult;
-}
-
-
 //
 // Try to make a path relative to the 'resources/' directory
 //