Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleo path is relative #193

Merged
merged 2 commits into from
Sep 15, 2024
Merged

cleo path is relative #193

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52998c0
cleo path is relative
x87 Sep 14, 2024
0655a0c
add comment back
x87 Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions source/CScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,12 +708,15 @@ namespace CLEO
if(customWorkDir != nullptr)
fsPath = ResolvePath(customWorkDir) / fsPath;
else
{
if (Filepath_Root.compare(GetWorkDir()) != 0) // ModLoader support: do not expand game dir relative paths
{
fsPath = GetWorkDir() / fsPath;
}
}
fsPath = GetWorkDir() / fsPath;

auto resolved = FS::weakly_canonical(fsPath).string();

// ModLoader support: do not expand game dir relative paths
if (resolved.find(Filepath_Root) == 0)
return FS::relative(resolved, Filepath_Root).string();
else
return resolved;
x87 marked this conversation as resolved.
Show resolved Hide resolved
}

return FS::weakly_canonical(fsPath).string();
Expand Down