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

Merge pull request #49173 from KoBeWi/navigational_oblivion

Browse source 
Tweak arguments of list_dir_begin() (skips navigational and hidden files by default)
This commit is contained in:
Rémi Verschelde 2021-05-31 14:33:58 +02:00 • committed by GitHub
commit 643da45e16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/core_bind.cpp
View file

@ -1616,11 +1616,11 @@ bool _Directory::is_open() const {
return d && dir_open;
}
Error _Directory::list_dir_begin(bool p_skip_navigational, bool p_skip_hidden) {
Error _Directory::list_dir_begin(bool p_show_navigational, bool p_show_hidden) {
ERR_FAIL_COND_V_MSG(!is_open(), ERR_UNCONFIGURED, "Directory must be opened before use.");
_list_skip_navigational = p_skip_navigational;
_list_skip_hidden = p_skip_hidden;
_list_skip_navigational = !p_show_navigational;
_list_skip_hidden = !p_show_hidden;
return d->list_dir_begin();
}
@ -1758,7 +1758,7 @@ Error _Directory::remove(String p_name) {
void _Directory::_bind_methods() {
ClassDB::bind_method(D_METHOD("open", "path"), &_Directory::open);
ClassDB::bind_method(D_METHOD("list_dir_begin", "skip_navigational", "skip_hidden"), &_Directory::list_dir_begin, DEFVAL(false), DEFVAL(false));
ClassDB::bind_method(D_METHOD("list_dir_begin", "show_navigational", "show_hidden"), &_Directory::list_dir_begin, DEFVAL(false), DEFVAL(false));
ClassDB::bind_method(D_METHOD("get_next"), &_Directory::get_next);
ClassDB::bind_method(D_METHOD("current_is_dir"), &_Directory::current_is_dir);
ClassDB::bind_method(D_METHOD("list_dir_end"), &_Directory::list_dir_end);

2
core/core_bind.h
View file

@ -467,7 +467,7 @@ public:
bool is_open() const;
Error list_dir_begin(bool p_skip_navigational = false, bool p_skip_hidden = false); // This starts dir listing.
Error list_dir_begin(bool p_show_navigational = false, bool p_show_hidden = false); // This starts dir listing.
String get_next();
bool current_is_dir() const;