quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* load all found *.fgd, not just halflife.fgd

Browse Source
This commit is contained in:
Garux 2021-04-07 02:31:28 +03:00
parent 31a79faee4
commit c6c978a38f
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
radiant/eclass_fgd.cpp
View File

@ -601,9 +601,32 @@ public:
}
void realise(){
if ( --m_unrealised == 0 ) {
StringOutputStream filename( 256 );
filename << GlobalRadiant().getGameToolsPath() << GlobalRadiant().getGameName() << "/halflife.fgd";
EntityClassFGD_loadFile( filename.c_str() );
{
const auto baseDirectory = StringOutputStream( 256 )( GlobalRadiant().getGameToolsPath(), GlobalRadiant().getRequiredGameDescriptionKeyValue( "basegame" ), '/' );
const auto gameDirectory = StringOutputStream( 256 )( GlobalRadiant().getGameToolsPath(), GlobalRadiant().getGameName(), '/' );
const auto pathLess = []( const CopiedString& one, const CopiedString& other ){
return path_less( one.c_str(), other.c_str() );
};
std::map<CopiedString, const char*, decltype( pathLess )> name_path( pathLess );
const auto constructDirectory = [&name_path]( const char* directory, const char* extension ){
globalOutputStream() << "EntityClass: searching " << makeQuoted( directory ) << " for *." << extension << '\n';
Directory_forEach( directory, matchFileExtension( extension, [directory, &name_path]( const char *name ){
name_path.emplace( name, directory );
} ) );
};
constructDirectory( baseDirectory, "fgd" );
if ( !string_equal( baseDirectory, gameDirectory ) ) {
constructDirectory( gameDirectory, "fgd" );
}
for( const auto& [ name, path ] : name_path ){
EntityClassFGD_loadFile( StringOutputStream()( path, name.c_str() ) );
}
}
{
for ( EntityClasses::iterator i = g_EntityClassFGD_classes.begin(); i != g_EntityClassFGD_classes.end(); ++i )