diff options
| author | Florian Kothmeier <floriankothmeier@web.de> | 2019-09-23 22:41:25 +0200 |
|---|---|---|
| committer | Florian Kothmeier <floriankothmeier@web.de> | 2019-09-25 15:29:59 +0200 |
| commit | aae25abf3080283bbff29b8264f24d37f935922a (patch) | |
| tree | dc1d35e5d2aa8d7816a8b4fb55bd05ad37d54c2b /core/project_settings.cpp | |
| parent | 0ea54eeb0672c405d7ad0edf8444f0d86158f8b6 (diff) | |
| download | redot-engine-aae25abf3080283bbff29b8264f24d37f935922a.tar.gz | |
Add flag to control the replacement of files by ProjectSettings.load_resource_pack
Diffstat (limited to 'core/project_settings.cpp')
| -rw-r--r-- | core/project_settings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/project_settings.cpp b/core/project_settings.cpp index ec2c5ecbb3..ce28cabadb 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -264,12 +264,12 @@ void ProjectSettings::_get_property_list(List<PropertyInfo> *p_list) const { } } -bool ProjectSettings::_load_resource_pack(const String &p_pack) { +bool ProjectSettings::_load_resource_pack(const String &p_pack, bool p_replace_files) { if (PackedData::get_singleton()->is_disabled()) return false; - bool ok = PackedData::get_singleton()->add_pack(p_pack) == OK; + bool ok = PackedData::get_singleton()->add_pack(p_pack, p_replace_files) == OK; if (!ok) return false; @@ -979,7 +979,7 @@ void ProjectSettings::_bind_methods() { ClassDB::bind_method(D_METHOD("localize_path", "path"), &ProjectSettings::localize_path); ClassDB::bind_method(D_METHOD("globalize_path", "path"), &ProjectSettings::globalize_path); ClassDB::bind_method(D_METHOD("save"), &ProjectSettings::save); - ClassDB::bind_method(D_METHOD("load_resource_pack", "pack"), &ProjectSettings::_load_resource_pack); + ClassDB::bind_method(D_METHOD("load_resource_pack", "pack", "replace_files"), &ProjectSettings::_load_resource_pack, DEFVAL(true)); ClassDB::bind_method(D_METHOD("property_can_revert", "name"), &ProjectSettings::property_can_revert); ClassDB::bind_method(D_METHOD("property_get_revert", "name"), &ProjectSettings::property_get_revert); |