Merge pull request #147 from alanedwardes/vbsp-fixes

Changed VBSP to check both the EXECUTABLE_PATH and the MOD path for FDG files.
This commit is contained in:
Jørgen P. Tjernø 2013-12-03 10:24:59 -08:00
commit 45cc6eccbc
2 changed files with 2 additions and 2 deletions

View File

@ -2003,7 +2003,7 @@ void CMapFile::CheckForInstances( const char *pszFileName )
char FDGPath[ MAX_PATH ]; char FDGPath[ MAX_PATH ];
if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "EXECUTABLE_PATH", FDGPath, sizeof( FDGPath ) ) ) if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "EXECUTABLE_PATH", FDGPath, sizeof( FDGPath ) ) )
{ {
if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "", FDGPath, sizeof( FDGPath ) ) ) if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, NULL, FDGPath, sizeof( FDGPath ) ) )
{ {
Msg( "Could not locate GameData file %s\n", GameDataFile ); Msg( "Could not locate GameData file %s\n", GameDataFile );
} }

View File

@ -2003,7 +2003,7 @@ void CMapFile::CheckForInstances( const char *pszFileName )
char FDGPath[ MAX_PATH ]; char FDGPath[ MAX_PATH ];
if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "EXECUTABLE_PATH", FDGPath, sizeof( FDGPath ) ) ) if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "EXECUTABLE_PATH", FDGPath, sizeof( FDGPath ) ) )
{ {
if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "", FDGPath, sizeof( FDGPath ) ) ) if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, NULL, FDGPath, sizeof( FDGPath ) ) )
{ {
Msg( "Could not locate GameData file %s\n", GameDataFile ); Msg( "Could not locate GameData file %s\n", GameDataFile );
} }