diff options
Diffstat (limited to 'core/engine.cpp')
| -rw-r--r-- | core/engine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/engine.cpp b/core/engine.cpp index 85ad175f38..5361e09a8a 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -60,7 +60,7 @@ void Engine::set_target_fps(int p_fps) { _target_fps = p_fps > 0 ? p_fps : 0; } -float Engine::get_target_fps() const { +int Engine::get_target_fps() const { return _target_fps; } @@ -114,7 +114,7 @@ Dictionary Engine::get_version_info() const { static Array array_from_info(const char *const *info_list) { Array arr; - for (int i = 0; info_list[i] != NULL; i++) { + for (int i = 0; info_list[i] != nullptr; i++) { arr.push_back(info_list[i]); } return arr; @@ -193,7 +193,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); - ERR_FAIL_COND_V_MSG(!E, NULL, "Failed to retrieve non-existent singleton '" + p_name + "'."); + ERR_FAIL_COND_V_MSG(!E, nullptr, "Failed to retrieve non-existent singleton '" + p_name + "'."); return E->get(); }; @@ -208,7 +208,7 @@ void Engine::get_singletons(List<Singleton> *p_singletons) { p_singletons->push_back(E->get()); } -Engine *Engine::singleton = NULL; +Engine *Engine::singleton = nullptr; Engine *Engine::get_singleton() { return singleton; |