From f714637e58034b6340fa0725c7935a1ae29d92c0 Mon Sep 17 00:00:00 2001 From: Anish Date: Fri, 27 Apr 2018 01:12:50 +0530 Subject: Allows setting the Timer wait_time in start method. Allows shortening the two line method of Timer.set_wait_time followed by Timer.start set wait_time as a parameter to Timer.start. Also modifies the class documentation. Fixes: #18107 --- scene/main/timer.cpp | 7 +++++-- scene/main/timer.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'scene/main') diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index ad2cdbfd0f..c285694dfa 100755 --- a/scene/main/timer.cpp +++ b/scene/main/timer.cpp @@ -107,7 +107,10 @@ bool Timer::has_autostart() const { return autostart; } -void Timer::start() { +void Timer::start(float p_time) { + if (p_time > 0) { + set_wait_time(p_time); + } time_left = wait_time; _set_process(true); } @@ -185,7 +188,7 @@ void Timer::_bind_methods() { ClassDB::bind_method(D_METHOD("set_autostart", "enable"), &Timer::set_autostart); ClassDB::bind_method(D_METHOD("has_autostart"), &Timer::has_autostart); - ClassDB::bind_method(D_METHOD("start"), &Timer::start); + ClassDB::bind_method(D_METHOD("start", "time_sec"), &Timer::start, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("stop"), &Timer::stop); ClassDB::bind_method(D_METHOD("set_paused", "paused"), &Timer::set_paused); diff --git a/scene/main/timer.h b/scene/main/timer.h index 410d985407..2f42252a7e 100755 --- a/scene/main/timer.h +++ b/scene/main/timer.h @@ -64,7 +64,7 @@ public: void set_autostart(bool p_start); bool has_autostart() const; - void start(); + void start(float p_time = -1); void stop(); void set_paused(bool p_paused); -- cgit v1.2.3