diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-03-06 00:17:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-06 00:17:39 +0100 |
commit | 9b4d4bbaea8d845b28c62d87f47fd8f823987d4b (patch) | |
tree | 7c636b3ed1a9c987da718607c5ebafa47da13f1c /scene | |
parent | 2d96b4c9893f92b1b5c60010cf548b25898705a5 (diff) | |
parent | bc3aff9b46c121eb60ef5e2a1b2ea9b00432981d (diff) |
Merge pull request #58803 from KoBeWi/a_bit_of_everything
Various code and documentation improvements
Diffstat (limited to 'scene')
-rw-r--r-- | scene/main/scene_tree.cpp | 2 | ||||
-rw-r--r-- | scene/resources/packed_scene.cpp | 2 | ||||
-rw-r--r-- | scene/resources/packed_scene.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 69e7472cf2..d1e8b477a6 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -486,7 +486,7 @@ bool SceneTree::process(double p_time) { } E->get()->set_time_left(time_left); - if (time_left < 0) { + if (time_left <= 0) { E->get()->emit_signal(SNAME("timeout")); timers.erase(E); } diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 9d388d465d..2f1ac7a83a 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -1653,7 +1653,7 @@ void PackedScene::recreate_state() { #endif } -Ref<SceneState> PackedScene::get_state() { +Ref<SceneState> PackedScene::get_state() const { return state; } diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h index 81b38840d9..96222937d0 100644 --- a/scene/resources/packed_scene.h +++ b/scene/resources/packed_scene.h @@ -228,7 +228,7 @@ public: virtual void set_last_modified_time(uint64_t p_time) override { state->set_last_modified_time(p_time); } #endif - Ref<SceneState> get_state(); + Ref<SceneState> get_state() const; PackedScene(); }; |