diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-08-17 13:31:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-17 13:31:08 +0200 |
commit | de4aabe89b7b68677f145f21c956183bbc92f686 (patch) | |
tree | 20b2e819d599d6d1bd459bb51880c31e97cfe825 /core/io/resource_saver.cpp | |
parent | 40640a01dc90be00e55e4eef3c7800401ef63b18 (diff) | |
parent | 71d71d55b5c0d6da4d1555823ac432bf0b33389a (diff) |
Merge pull request #31244 from Unholydeath/BB_ChangeErrorMacros
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in 'core/' and 'editor/'
Diffstat (limited to 'core/io/resource_saver.cpp')
-rw-r--r-- | core/io/resource_saver.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp index 369cd93442..a9ad62afe6 100644 --- a/core/io/resource_saver.cpp +++ b/core/io/resource_saver.cpp @@ -214,13 +214,11 @@ bool ResourceSaver::add_custom_resource_format_saver(String script_path) { Ref<Script> s = res; StringName ibt = s->get_instance_base_type(); bool valid_type = ClassDB::is_parent_class(ibt, "ResourceFormatSaver"); - ERR_EXPLAIN("Script does not inherit a CustomResourceSaver: " + script_path); - ERR_FAIL_COND_V(!valid_type, false); + ERR_FAIL_COND_V_MSG(!valid_type, false, "Script does not inherit a CustomResourceSaver: " + script_path + "."); Object *obj = ClassDB::instance(ibt); - ERR_EXPLAIN("Cannot instance script as custom resource saver, expected 'ResourceFormatSaver' inheritance, got: " + String(ibt)); - ERR_FAIL_COND_V(obj == NULL, false); + ERR_FAIL_COND_V_MSG(obj == NULL, false, "Cannot instance script as custom resource saver, expected 'ResourceFormatSaver' inheritance, got: " + String(ibt) + "."); ResourceFormatSaver *crl = Object::cast_to<ResourceFormatSaver>(obj); crl->set_script(s.get_ref_ptr()); |