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

Merge pull request #64413 from m4gr3d/fix_get_current_dir_3x

This commit is contained in:
Rémi Verschelde 2022-08-23 16:15:26 +02:00 committed by GitHub
parent aeabd3dcb9 b5e1096c61
commit c52cada7a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platform/android/dir_access_jandroid.cpp
View File

@ -134,6 +134,20 @@ String DirAccessJAndroid::get_drive(int p_drive) {
} }
} }
String DirAccessJAndroid::get_current_dir() {
String base = _get_root_path();
String bd = current_dir;
if (base != "") {
bd = current_dir.replace_first(base, "");
}
if (bd.begins_with("/")) {
return _get_root_string() + bd.substr(1, bd.length());
} else {
return _get_root_string() + bd;
}
}
Error DirAccessJAndroid::change_dir(String p_dir) { Error DirAccessJAndroid::change_dir(String p_dir) {
String new_dir = get_absolute_path(p_dir); String new_dir = get_absolute_path(p_dir);
if (new_dir == current_dir) { if (new_dir == current_dir) {

1
platform/android/dir_access_jandroid.h
View File

@ -69,6 +69,7 @@ public:
virtual String get_drive(int p_drive) override; virtual String get_drive(int p_drive) override;
virtual Error change_dir(String p_dir) override; ///< can be relative or absolute, return false on success virtual Error change_dir(String p_dir) override; ///< can be relative or absolute, return false on success
virtual String get_current_dir() override; ///< return current dir location
virtual bool file_exists(String p_file) override; virtual bool file_exists(String p_file) override;
virtual bool dir_exists(String p_dir) override; virtual bool dir_exists(String p_dir) override;