id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-19 08:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix idParser::Directive_include() to properly handle full os path as fetched by idLexer::GetFileName()

Browse source
This commit is contained in:
Stephen Saunders 2023-01-07 22:53:11 -05:00
parent 1c4883354b
commit 7485a123f6
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
neo/idlib/Parser.cpp
View file

@ -1150,11 +1150,18 @@ int idParser::Directive_include( idToken* token, bool supressWarning )
// try relative to the current file
path = scriptstack->GetFileName();
path.StripFilename();
path += "/";
path += *token;
if( !script->LoadFile( path, OSPath ) )
// first remove any trailing path overlap with token
idStr token_path = *token;
if( !path.StripTrailingOnce( token_path.StripFilename() ) )
{
// try absolute path
// if no path overlap add separator before token
path += "/";
}
path += *token;
// try assuming a full os path from GetFileName()
if( !script->LoadFile( path, true ) )
{
// try from the token path
path = *token;
if( !script->LoadFile( path, OSPath ) )
{