summaryrefslogtreecommitdiff
path: root/doc/classes
diff options
context:
space:
mode:
authorThomas ten Cate <ttencate@gmail.com>2018-07-02 21:25:51 +0200
committerThomas ten Cate <ttencate@gmail.com>2018-07-02 21:33:21 +0200
commit117c666fcea1067c0fcefe4414fd1e530a65d622 (patch)
treeb1cb16dd73be6def292b5eeee35622ec33ce1375 /doc/classes
parent2dc738ce2733757631a4ccf413a92411c4400246 (diff)
Document return value of yield() with signals
Fixes godotengine/godot-docs#1478
Diffstat (limited to 'doc/classes')
-rw-r--r--doc/classes/@GDScript.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/classes/@GDScript.xml b/doc/classes/@GDScript.xml
index a4ca830d4d..b5f5fed3f9 100644
--- a/doc/classes/@GDScript.xml
+++ b/doc/classes/@GDScript.xml
@@ -1145,8 +1145,9 @@
<argument index="1" name="signal" type="String" default="&quot;&quot;">
</argument>
<description>
- Stops the function execution and returns the current state. Call [method GDScriptFunctionState.resume] on the state to resume execution. This invalidates the state.
- Returns anything that was passed to the resume function call. If passed an object and a signal, the execution is resumed when the object's signal is emitted.
+ Stops the function execution and returns the current suspended state to the calling function.
+ From the caller, call [method GDScriptFunctionState.resume] on the state to resume execution. This invalidates the state. Within the resumed function, [code]yield()[/code] returns whatever was passed to the [code]resume()[/code] function call.
+ If passed an object and a signal, the execution is resumed when the object emits the given signal. In this case, [code]yield()[/code] returns the argument passed to [code]emit_signal()[/code] if the signal takes only one argument, or an array containing all the arguments passed to [code]emit_signal()[/code] if the signal takes multiple arguments.
</description>
</method>
</methods>