diff options
| author | Braden Bodily <thebodily@gmail.com> | 2019-08-14 20:57:49 -0600 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-17 12:33:15 +0200 |
| commit | 71d71d55b5c0d6da4d1555823ac432bf0b33389a (patch) | |
| tree | 20b2e819d599d6d1bd459bb51880c31e97cfe825 /core/engine.cpp | |
| parent | 40640a01dc90be00e55e4eef3c7800401ef63b18 (diff) | |
| download | redot-engine-71d71d55b5c0d6da4d1555823ac432bf0b33389a.tar.gz | |
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in 'core/' and 'editor/'
Condensed some if and ERR statements. Added dots to end of error messages
Couldn't figure out EXPLAINC. These files gave me trouble: core/error_macros.h, core/io/file_access_buffered_fa.h (where is it?),
core/os/memory.cpp,
drivers/png/png_driver_common.cpp,
drivers/xaudio2/audio_driver_xaudio2.cpp (where is it?)
Diffstat (limited to 'core/engine.cpp')
| -rw-r--r-- | core/engine.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/engine.cpp b/core/engine.cpp index 0dd0459403..937439faaf 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -197,10 +197,7 @@ void Engine::add_singleton(const Singleton &p_singleton) { Object *Engine::get_singleton_object(const String &p_name) const { const Map<StringName, Object *>::Element *E = singleton_ptrs.find(p_name); - if (!E) { - ERR_EXPLAIN("Failed to retrieve non-existent singleton '" + p_name + "'"); - ERR_FAIL_V(NULL); - } + ERR_FAIL_COND_V_MSG(!E, NULL, "Failed to retrieve non-existent singleton '" + p_name + "'."); return E->get(); }; |