Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-06-23 18:29:01 -03:00
commit b8cf551df9
1 file changed
+2 -2
@@ -331,7 +331,7 @@ select(num) ->
); );
global_selected_point = if (global_selected_point == selected_point, null, selected_point); global_selected_point = if (global_selected_point == selected_point, null, selected_point);
global_needs_updating = true; global_needs_updating = true;
// no need to _update since path is still valid
); );
// player can also punch the mannequin to select/deselect it // player can also punch the mannequin to select/deselect it
@@ -501,7 +501,7 @@ play() ->
task( _() -> ( task( _() -> (
if (global_playing_path, // we don't want to join_task not to lock it just in case. No need to panic here if (global_playing_path, // we don't want to join_task not to lock it just in case. No need to panic here
global_playing_path = false; // cancel current path rendering global_playing_path = false; // cancel current path rendering
sleep(1500); // in case we interrupt previous playbacks sleep(1500);
); );
showing_path = global_showing_path; showing_path = global_showing_path;
hide(); hide();