fix: fixes inconsistent return type from queue_event_from_esc
This commit is contained in:
committed by
Duncan Brown
parent
8dbcd52e66
commit
ad445cd43b
@@ -11,3 +11,5 @@ wait 2
|
||||
# Hide main menu, automatic transitions ENABLED
|
||||
hide_menu main true
|
||||
|
||||
:look
|
||||
say player "button main menu"
|
||||
@@ -36,3 +36,6 @@ wait 1
|
||||
change_scene res://game/rooms/room14/room14.tscn false
|
||||
|
||||
# Do not transition here either, as change_scene ends the execution of this script
|
||||
|
||||
:look
|
||||
say player "Button change scene"
|
||||
@@ -26,3 +26,5 @@ wait 2
|
||||
change_scene res://game/rooms/room14/room14.tscn
|
||||
|
||||
|
||||
:look
|
||||
say player "Button change scene auto"
|
||||
@@ -11,3 +11,6 @@ wait 2
|
||||
# Hide pause menu, automatic transition are disabled by default
|
||||
# So we can manage them manually using `transition` ESC command
|
||||
hide_menu pause
|
||||
|
||||
:look
|
||||
say player "Button pause menu"
|
||||
@@ -36,4 +36,12 @@
|
||||
|
||||
|
||||
:ready
|
||||
queue_event worker moveworker
|
||||
# Both events will queue one after the other. As event "moveworker" features
|
||||
# both a blocking and non-blocking command, the blocking command will block
|
||||
# until it's finished. At this point, moveworker2's event will fire.
|
||||
# The end result is that you'll see worker1 start moving while the player
|
||||
# speaks, and once the say command concludes, worker 2 will start walking.
|
||||
queue_event worker moveworker _queuedemo true
|
||||
queue_event worker2 moveworker2 _queuedemo
|
||||
|
||||
|
||||
@@ -1,2 +1,8 @@
|
||||
:moveworker
|
||||
# Non-blocking command
|
||||
walk worker worker_target
|
||||
|
||||
# Blocking command. This will block the queued walk event following this
|
||||
# (as specified in room14.esc) from starting until this command has
|
||||
# completed.
|
||||
say player "Blocking"
|
||||
|
||||
3
game/rooms/room14/esc/worker2.esc
Normal file
3
game/rooms/room14/esc/worker2.esc
Normal file
@@ -0,0 +1,3 @@
|
||||
:moveworker2
|
||||
# Non-blocking command
|
||||
walk worker2 worker2_target
|
||||
Reference in New Issue
Block a user