Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #65066 from aaronfranke/str-path-join

Browse source
This commit is contained in:
Rémi Verschelde 2022-08-30 10:01:11 +02:00 • committed by GitHub
commit 432b25d364
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
100 changed files with 519 additions and 519 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/main.cpp
View file

@ -2366,7 +2366,7 @@ bool Main::start() {
// Custom modules are always located by absolute path.
String path = _doc_data_class_paths[i].path;
if (path.is_relative_path()) {
path = doc_tool_path.plus_file(path);
path = doc_tool_path.path_join(path);
}
String name = _doc_data_class_paths[i].name;
doc_data_classes[name] = path;
@ -2384,7 +2384,7 @@ bool Main::start() {
}
}
String index_path = doc_tool_path.plus_file("doc/classes");
String index_path = doc_tool_path.path_join("doc/classes");
// Create the main documentation directory if it doesn't exist
Ref<DirAccess> da = DirAccess::create_for_path(index_path);
err = da->make_dir_recursive(index_path);
@ -2754,11 +2754,11 @@ bool Main::start() {
if (sep == -1) {
Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
local_game_path = da->get_current_dir().plus_file(local_game_path);
local_game_path = da->get_current_dir().path_join(local_game_path);
} else {
Ref<DirAccess> da = DirAccess::open(local_game_path.substr(0, sep));
if (da.is_valid()) {
local_game_path = da->get_current_dir().plus_file(
local_game_path = da->get_current_dir().path_join(
local_game_path.substr(sep + 1, local_game_path.length()));
}
}