godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DirAccessPack: Fix dir_exists and file_exists for res:// paths 

Both methods check against containers using relative paths as index,
so the `res://` part needs to be stripped.

Fixes #26009.
This commit is contained in:
Rémi Verschelde 2019-08-17 19:03:18 +02:00
parent 86371b7298
commit ad8746e0de
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/file_access_pack.cpp
View File

@ -90,7 +90,7 @@ void PackedData::add_path(const String &pkg_path, const String &path, uint64_t o
} }
} }
String filename = path.get_file(); String filename = path.get_file();
// Don't add as a file if the path points to a directoryy // Don't add as a file if the path points to a directory
if (!filename.empty()) { if (!filename.empty()) {
cd->files.insert(filename); cd->files.insert(filename);
} }
@ -460,11 +460,15 @@ String DirAccessPack::get_current_dir() {
bool DirAccessPack::file_exists(String p_file) { bool DirAccessPack::file_exists(String p_file) {
p_file = fix_path(p_file);
return current->files.has(p_file); return current->files.has(p_file);
} }
bool DirAccessPack::dir_exists(String p_dir) { bool DirAccessPack::dir_exists(String p_dir) {
p_dir = fix_path(p_dir);
return current->subdirs.has(p_dir); return current->subdirs.has(p_dir);
} }