Fixed resource file checksum error caused by scripts modifying downloaded files.

Author: ccw808

MTA10/mods/deathmatch/logic/CResourceManager.cpp

@@ -232,6 +232,19 @@ bool CResourceManager::IsResourceFile( const SString& strInFilename )
     return MapContains( m_ResourceFileMap, strFilename );
 }
 
+// Remove this file from the checks as it has been changed by script actions
+void CResourceManager::FileModifedByScript( const SString& strInFilename )
+{
+    SString strFilename = PathConform( strInFilename ).ToLower();
+    CDownloadableResource* pResourceFile = MapFindRef( m_ResourceFileMap, strFilename );
+    if ( pResourceFile )
+    {
+        SString strMessage( "Resource file modifed by script: %s ", *ConformResourcePath( strInFilename ) );
+        AddReportLog( 7059, strMessage + g_pNet->GetConnectedServer( true ), 10 );
+        MapRemove( m_ResourceFileMap, strFilename );
+    }
+}
+
 // Check resource file data matches server checksum
 void CResourceManager::ValidateResourceFile( const SString& strInFilename, const CBuffer& fileData )
 {
@@ -259,7 +272,7 @@ void CResourceManager::ValidateResourceFile( const SString& strInFilename, const
                     CMD5Hasher::ConvertToHex( checksum.md5, szMd5 );
                     char szMd5Wanted[33];
                     CMD5Hasher::ConvertToHex( pResourceFile->GetServerChecksum().md5, szMd5Wanted );
-                    SString strMessage( "Resource file checksum failed: %s [Size:%d MD5:%s][Wanted:%s][datasize:%d]", *ConformResourcePath( strInFilename ), (int)FileSize( strInFilename ), szMd5, szMd5Wanted, fileData.GetSize() );
+                    SString strMessage( "Resource file checksum failed: %s [Size:%d MD5:%s][Wanted:%s][datasize:%d] ", *ConformResourcePath( strInFilename ), (int)FileSize( strInFilename ), szMd5, szMd5Wanted, fileData.GetSize() );
                     g_pClientGame->TellServerSomethingImportant( 1007, strMessage, false );
                     g_pCore->GetConsole ()->Print( strMessage );
                     AddReportLog( 7057, strMessage + g_pNet->GetConnectedServer( true ), 10 );
@@ -269,7 +282,7 @@ void CResourceManager::ValidateResourceFile( const SString& strInFilename, const
                 {
                     char szMd5[33];
                     CMD5Hasher::ConvertToHex( checksum.md5, szMd5 );
-                    SString strMessage( "Attempt to load resource file before it is ready: %s [Size:%d MD5:%s]", *ConformResourcePath( strInFilename ), (int)FileSize( strInFilename ), szMd5 );
+                    SString strMessage( "Attempt to load resource file before it is ready: %s [Size:%d MD5:%s] ", *ConformResourcePath( strInFilename ), (int)FileSize( strInFilename ), szMd5 );
                     g_pClientGame->TellServerSomethingImportant( 1008, strMessage, false );
                     g_pCore->GetConsole ()->Print( strMessage );
                     AddReportLog( 7058, strMessage + g_pNet->GetConnectedServer( true ), 10 );

MTA10/mods/deathmatch/logic/CResourceManager.h

@@ -56,6 +56,7 @@ class CResourceManager
     void                        OnRemoveResourceFile        ( CDownloadableResource* pResourceFile );
     void                        OnDownloadedResourceFile    ( const SString& strFilename );
     bool                        IsResourceFile              ( const SString& strFilename );
+    void                        FileModifedByScript         ( const SString& strFilename );
     void                        ValidateResourceFile        ( const SString& strFilename, const CBuffer& fileData );
 
     static bool                 ParseResourcePathInput      ( std::string strInput, CResource* &pResource, std::string &strPath, std::string &strMetaPath );

MTA10/mods/shared_logic/luadefs/CLuaFileDefs.cpp

@@ -60,6 +60,9 @@ int CLuaFileDefs::fileCreate ( lua_State* luaVM )
             CResource* pResource = pLuaMain->GetResource ();
             if ( CResourceManager::ParseResourcePathInput ( filePath, pResource, strAbsPath ) )
             {
+                // Inform file verifier
+                g_pClientGame->GetResourceManager()->FileModifedByScript( strAbsPath );
+
                 // Make sure the destination folder exist so we can create the file
                 MakeSureDirExists ( strAbsPath.c_str () );
 
@@ -163,6 +166,10 @@ int CLuaFileDefs::fileOpen ( lua_State* luaVM )
             CResource* pResource = pLuaMain->GetResource ();
             if ( CResourceManager::ParseResourcePathInput ( filePath, pResource, strAbsPath ) )
             {
+                // Inform file verifier
+                if ( !readOnly )
+                    g_pClientGame->GetResourceManager()->FileModifedByScript( strAbsPath );
+
                 // Create the file to create
                 CScriptFile* pFile = new CScriptFile ( strAbsPath.c_str (), DEFAULT_MAX_FILESIZE );
                 assert ( pFile );
@@ -548,6 +555,9 @@ int CLuaFileDefs::fileDelete ( lua_State* luaVM )
             CResource* pResource = pLuaMain->GetResource ();
             if ( CResourceManager::ParseResourcePathInput ( filePath, pResource, strPath ) )
             {
+                // Inform file verifier
+                g_pClientGame->GetResourceManager()->FileModifedByScript( strPath );
+
                 if ( FileDelete ( strPath.c_str () ) )
                 {
                     // If file removed return success
@@ -610,6 +620,9 @@ int CLuaFileDefs::fileRename ( lua_State* luaVM )
                     }
                     else
                     {
+                        // Inform file verifier
+                        g_pClientGame->GetResourceManager()->FileModifedByScript( strCurAbsPath );
+
                         // Make sure the destination folder exist so we can move the file
                         MakeSureDirExists ( strNewAbsPath.c_str () );
 
@@ -684,6 +697,9 @@ int CLuaFileDefs::fileCopy ( lua_State* luaVM )
                     }
                     else
                     {
+                        // Inform file verifier
+                        g_pClientGame->GetResourceManager()->FileModifedByScript( strNewAbsPath );
+
                         // Make sure the destination folder exists so we can copy the file
                         MakeSureDirExists ( strNewAbsPath );