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

Merge branch 'develop' of https://github.com/mapbase-source/source-sdk-2013 into feature/newer-toolsets

Browse Source
This commit is contained in:
Blixibon 2021-07-16 11:57:06 -05:00
commit 2bc8631db1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sp/src/utils/vbsp/map.cpp
View File

@ -2105,7 +2105,12 @@ void CMapFile::CheckForInstances( const char *pszFileName )
} }
char FDGPath[ MAX_PATH ]; char FDGPath[ MAX_PATH ];
#ifdef MAPBASE
// Mapbase's FGD would be in a MOD path
if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "MOD", FDGPath, sizeof( FDGPath ) ) )
#else
if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "EXECUTABLE_PATH", FDGPath, sizeof( FDGPath ) ) ) if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "EXECUTABLE_PATH", FDGPath, sizeof( FDGPath ) ) )
#endif
{ {
if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, NULL, FDGPath, sizeof( FDGPath ) ) ) if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, NULL, FDGPath, sizeof( FDGPath ) ) )
{ {
@ -2606,7 +2611,7 @@ void CMapFile::MergeEntities( entity_t *pInstanceEntity, CMapFile *Instance, Vec
Msg( "Instance Entity %d remapped to %d\n", i, num_entities + i ); Msg( "Instance Entity %d remapped to %d\n", i, num_entities + i );
Msg( " FirstBrush: from %d to %d\n", Instance->entities[ i ].firstbrush, entity->firstbrush ); Msg( " FirstBrush: from %d to %d\n", Instance->entities[ i ].firstbrush, entity->firstbrush );
Msg( " KV Pairs:\n" ); Msg( " KV Pairs:\n" );
for ( epair_t *ep = entity->epairs; ep->next != NULL; ep = ep->next ) for ( epair_t *ep = entity->epairs; ep != NULL; ep = ep->next )
{ {
Msg( " %s %s\n", ep->key, ep->value ); Msg( " %s %s\n", ep->key, ep->value );
} }