MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-12-26 23:05:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed VScript custom file read method and increased the max size to 64 MB

Browse Source
This commit is contained in:
Blixibon 2021-04-21 15:13:54 -05:00
parent 491b258f70
commit fc9d699fed
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sp/src/game/shared/mapbase/vscript_singletons.cpp
View File

@ -985,7 +985,7 @@ void CScriptSaveRestoreUtil::ClearSavedTable( const char *szId )
// Read/Write to File // Read/Write to File
// Based on L4D2/Source 2 API // Based on L4D2/Source 2 API
//============================================================================= //=============================================================================
#define SCRIPT_MAX_FILE_READ_SIZE (16 * 1024) // 16KB #define SCRIPT_MAX_FILE_READ_SIZE (64 * 1024 * 1024) // 64MB
#define SCRIPT_MAX_FILE_WRITE_SIZE (64 * 1024 * 1024) // 64MB #define SCRIPT_MAX_FILE_WRITE_SIZE (64 * 1024 * 1024) // 64MB
#define SCRIPT_RW_PATH_ID "MOD" #define SCRIPT_RW_PATH_ID "MOD"
#define SCRIPT_RW_FULL_PATH_FMT "vscript_io/%s" #define SCRIPT_RW_FULL_PATH_FMT "vscript_io/%s"
@ -1012,11 +1012,11 @@ public:
} }
private: private:
static const char *m_pszReturnReadFile; static char *m_pszReturnReadFile;
} g_ScriptReadWrite; } g_ScriptReadWrite;
const char *CScriptReadWriteFile::m_pszReturnReadFile = NULL; char *CScriptReadWriteFile::m_pszReturnReadFile = NULL;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
@ -1074,19 +1074,32 @@ const char *CScriptReadWriteFile::FileRead( const char *szFile )
return NULL; return NULL;
} }
CUtlBuffer buf( 0, 0, CUtlBuffer::TEXT_BUFFER ); FileHandle_t file = g_pFullFileSystem->Open( pszFullName, "rb", SCRIPT_RW_PATH_ID );
if ( !g_pFullFileSystem->ReadFile( pszFullName, SCRIPT_RW_PATH_ID, buf, SCRIPT_MAX_FILE_READ_SIZE ) ) if ( !file )
{ {
return NULL; return NULL;
} }
// first time calling, allocate // Close the previous buffer
if ( !m_pszReturnReadFile ) if (m_pszReturnReadFile)
m_pszReturnReadFile = new char[SCRIPT_MAX_FILE_READ_SIZE]; g_pFullFileSystem->FreeOptimalReadBuffer( m_pszReturnReadFile );
V_strncpy( const_cast<char*>(m_pszReturnReadFile), (const char*)buf.Base(), buf.Size() ); unsigned bufSize = g_pFullFileSystem->GetOptimalReadSize( file, size + 2 );
buf.Purge(); m_pszReturnReadFile = (char*)g_pFullFileSystem->AllocOptimalReadBuffer( file, bufSize );
return m_pszReturnReadFile;
bool bRetOK = ( g_pFullFileSystem->ReadEx( m_pszReturnReadFile, bufSize, size, file ) != 0 );
g_pFullFileSystem->Close( file ); // close file after reading
if ( bRetOK )
{
m_pszReturnReadFile[size] = 0; // null terminate file as EOF
//buffer[size+1] = 0; // double NULL terminating in case this is a unicode file
return m_pszReturnReadFile;
}
else
{
return NULL;
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------