Added help info for a model crash.

Added possible fix for floating point precision not being restored.
Updated disk space check to use correct resource cache location.
Added check for Windows Safe Mode as it causes problems for MTA.
Removed annoying debug check when poking GTA memory.

Author: ccw808

MTA10/loader/MainFunctions.cpp

@@ -823,6 +823,14 @@ void CheckLibVersions( void )
     }
 
 #endif
+
+    if ( GetSystemMetrics( SM_CLEANBOOT ) != 0 )
+    {
+        DisplayErrorMessageBox ( SStringX(_( "MTA:SA is not compatible with Windows 'Safe Mode'.\n\n"
+                                    "Please restart your PC.\n" )
+                                    ), _E("CL42"), "safe-mode" );
+        return ExitProcess( EXIT_ERROR );
+    }
 }
 
 

MTA10/loader/Utils.cpp

@@ -1820,7 +1820,8 @@ void CheckAndShowModelProblems ( void )
     {
         SString strMsg;
         strMsg += _("GTA:SA had trouble loading a model.");
-        strMsg += SString( " (%d)", iModelId );
+        strMsg += SString( " (%d)\n\n", iModelId );
+        strMsg += _("If you recently modified gta3.img, then try reinstalling GTA:SA.");
         DisplayErrorMessageBox ( strMsg, _E("CL34"), SString( "gta-model-fail&id=%d&reason=%s", iModelId, *strReason ) );
     }
 }

MTA10/mods/shared_logic/lua/CLuaMain.cpp

@@ -2228,7 +2228,16 @@ int CLuaMain::PCall ( lua_State *L, int nargs, int nresults, int errfunc )
 
     g_pClientGame->ChangeFloatPrecision( true );
     g_pClientGame->GetScriptDebugging()->PushLuaMain ( this );
-    int iret = lua_pcall ( L, nargs, nresults, errfunc );
+    int iret = 0;
+    try
+    {
+        iret = lua_pcall ( L, nargs, nresults, errfunc );
+    }
+    catch(...)
+    {
+        // Can this happen?
+        AddReportLog( 7554, "CLuaMain::PCall - Unexpected execption thrown" );
+    }
     g_pClientGame->GetScriptDebugging()->PopLuaMain ( this );
     g_pClientGame->ChangeFloatPrecision( false );
 

MTA10/multiplayer_sa/CMultiplayerSA_CrashFixHacks.cpp

@@ -1518,6 +1518,50 @@ void _declspec(naked) HOOK_CAnimManager_CreateAnimAssocGroups()
 }
 
 
+//////////////////////////////////////////////////////////////////////////////////////////
+//
+// CAnimManager_CreateAnimAssocGroups
+//
+// A model (usually 7) has to be loaded to avoid a crash
+//
+//////////////////////////////////////////////////////////////////////////////////////////
+void OnMY_CAnimManager_CreateAnimAssocGroups( uint uiModelId )
+{
+    CModelInfo* pModelInfo = pGameInterface->GetModelInfo( uiModelId );
+    if ( pModelInfo->GetInterface()->pRwObject == NULL )
+    {
+        // Crash will occur at offset 00349b7b
+        LogEvent( 816, "Model not loaded", "CAnimManager_CreateAnimAssocGroups", SString( "No RwObject for model:%d", uiModelId ), 5416 );
+        CArgMap argMap;
+        argMap.Set( "id", uiModelId );
+        argMap.Set( "reason", "createanim" );
+        SetApplicationSetting( "diagnostics", "gta-model-fail", argMap.ToString() );
+    }
+}
+
+
+// Hook info
+#define HOOKPOS_CAnimManager_CreateAnimAssocGroups                 0x4D3D52
+#define HOOKSIZE_CAnimManager_CreateAnimAssocGroups                5
+#define HOOKCHECK_CAnimManager_CreateAnimAssocGroups               0x8B
+DWORD RETURN_CAnimManager_CreateAnimAssocGroups =                  0x4D3D59;
+void _declspec(naked) HOOK_CAnimManager_CreateAnimAssocGroups()
+{
+    _asm
+    {
+        pushad
+        push    eax
+        call    OnMY_CAnimManager_CreateAnimAssocGroups
+        add     esp, 4*1
+        popad
+
+        // Replaced code
+        mov     eax, 0x0A9B0C8[eax*4] 
+        jmp     RETURN_CAnimManager_CreateAnimAssocGroups
+    }
+}
+
+
 //////////////////////////////////////////////////////////////////////////////////////////
 //
 // Setup hooks for CrashFixHacks

Shared/sdk/SharedUtil.File.hpp

@@ -448,8 +448,14 @@ 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" ) ) )
+        if ( GetPathFreeSpaceMB( strFileCachePath ) < uiResourcesPathMinMB )
+            return GetPathDriveName( strFileCachePath );
+
     if ( GetPathFreeSpaceMB( GetMTASABaseDir() ) < uiResourcesPathMinMB )
         return GetPathDriveName( GetMTASABaseDir() );
+
     if ( GetPathFreeSpaceMB( GetSystemCommonAppDataPath() ) < uiDataPathMinMB )
         return GetPathDriveName( GetSystemCommonAppDataPath() );
    return ""; 

Shared/sdk/SharedUtil.MemAccess.hpp

@@ -131,11 +131,13 @@ namespace SharedUtil
         OutputDebugLine( SString( "[Mem] OpenMemWrite at %08x for %d bytes  (oldProt:%04x)", pAddr, uiAmount, hMem.oldProt ) );
 
 #ifdef MTA_DEBUG
+#if 0   // Annoying
         // Checks
         if ( IsProtectedSlowMem( (const void*)hMem.dwFirstPage ) )
             assert( hMem.oldProt == PAGE_EXECUTE_READ || hMem.oldProt == PAGE_READONLY );
         else
             assert( hMem.oldProt == PAGE_EXECUTE_READWRITE || hMem.oldProt == PAGE_EXECUTE_WRITECOPY );
+#endif
 #endif
 
         // Extra if more than one page