godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18454 from KidRigger/working_timer 

Allows setting the Timer wait_time in start method.
This commit is contained in:
Max Hilbrunner 2018-05-07 09:37:11 +02:00 committed by GitHub
parent 9b0c487dd4 f714637e58
commit e15305721d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/Timer.xml
View File

@ -21,8 +21,10 @@
<method name="start"> <method name="start">
<return type="void"> <return type="void">
</return> </return>
<argument index="0" name="time_sec" type="float" default="-1">
</argument>
<description> <description>
Starts the timer. This also resets the remaining time to [code]wait_time[/code]. Starts the timer. Sets [code]wait_time[/code] to [code]time_sec[/code] if [code]time_sec[/code] > 0. This also resets the remaining time to [code]wait_time[/code].
Note: this method will not resume a paused timer. See [method set_paused]. Note: this method will not resume a paused timer. See [method set_paused].
</description> </description>
</method> </method>

7
scene/main/timer.cpp
View File

@ -107,7 +107,10 @@ bool Timer::has_autostart() const {
return autostart; return autostart;
} }
void Timer::start() { void Timer::start(float p_time) {
if (p_time > 0) {
set_wait_time(p_time);
}
time_left = wait_time; time_left = wait_time;
_set_process(true); _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("set_autostart", "enable"), &Timer::set_autostart);
ClassDB::bind_method(D_METHOD("has_autostart"), &Timer::has_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("stop"), &Timer::stop);
ClassDB::bind_method(D_METHOD("set_paused", "paused"), &Timer::set_paused); ClassDB::bind_method(D_METHOD("set_paused", "paused"), &Timer::set_paused);

2
scene/main/timer.h
View File

@ -64,7 +64,7 @@ public:
void set_autostart(bool p_start); void set_autostart(bool p_start);
bool has_autostart() const; bool has_autostart() const;
void start(); void start(float p_time = -1);
void stop(); void stop();
void set_paused(bool p_paused); void set_paused(bool p_paused);