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

Added support for nested instances relative to their parents, which is what Hammer uses to display them

Browse Source
This commit is contained in:
Blixibon 2021-11-07 07:37:13 -06:00
parent b2116d07e9
commit 7e96be39b2
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2603,6 +2603,27 @@ void CMapFile::MergeEntities( entity_t *pInstanceEntity, CMapFile *Instance, Vec
SetKeyValue( entity, szKey, epInstance->value ); SetKeyValue( entity, szKey, epInstance->value );
} }
} }
// If the parent instance is within a relative path and no file relative to the main map exists, change it to be relative to the parent
char *pParentInstanceFile = ValueForKey( pInstanceEntity, "file" );
if ( pParentInstanceFile[ 0 ] && (strchr( pParentInstanceFile, '\\' ) || strchr( pParentInstanceFile, '/' )) )
{
char *pInstanceFile = ValueForKey( entity, "file" );
if ( pInstanceFile[ 0 ] )
{
char InstancePath[ MAX_PATH ];
if ( !DeterminePath( g_MainMapPath, pInstanceFile, InstancePath ) )
{
strcpy( InstancePath, pParentInstanceFile );
V_StripFilename( InstancePath );
V_strncat( InstancePath, "\\", sizeof( InstancePath ) );
V_strncat( InstancePath, pInstanceFile, sizeof( InstancePath ) );
SetKeyValue( entity, "file", InstancePath );
}
}
}
} }
#endif #endif
} }