oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: guards against scenes with no player set or loaded

Browse Source
This commit is contained in:
Duncan Brown
2022-08-23 20:43:17 -04:00
parent a2e5dd8f97
commit d04c46c14d
1 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
addons/escoria-core/game/core-scripts/esc_game.gd
View File

@@ -162,11 +162,17 @@ func do_walk(destination, params: Array = [], can_interrupt: bool = false) -> vo
# #
# - position: Position clicked # - position: Position clicked
func left_click_on_bg(position: Vector2) -> void: func left_click_on_bg(position: Vector2) -> void:
do_walk( if escoria.main.current_scene.player:
position, do_walk(
[escoria.main.current_scene.player.global_id], position,
true [escoria.main.current_scene.player.global_id],
) true
)
else:
escoria.logger.trace(
self,
"No player loaded for current scene. Ignoring left click on background."
)
# Called when the player right clicks on the background # Called when the player right clicks on the background
@@ -176,11 +182,17 @@ func left_click_on_bg(position: Vector2) -> void:
# #
# - position: Position clicked # - position: Position clicked
func right_click_on_bg(position: Vector2) -> void: func right_click_on_bg(position: Vector2) -> void:
do_walk( if escoria.main.current_scene.player:
position, do_walk(
[escoria.main.current_scene.player.global_id], position,
true [escoria.main.current_scene.player.global_id],
) true
)
else:
escoria.logger.trace(
self,
"No player loaded for current scene. Ignoring right click on background."
)
# Called when the player double clicks on the background # Called when the player double clicks on the background
@@ -190,11 +202,18 @@ func right_click_on_bg(position: Vector2) -> void:
# #
# - position: Position clicked # - position: Position clicked
func left_double_click_on_bg(position: Vector2) -> void: func left_double_click_on_bg(position: Vector2) -> void:
do_walk( if escoria.main.current_scene.player:
position, do_walk(
[escoria.main.current_scene.player.global_id, true], position,
true [escoria.main.current_scene.player.global_id, true],
) true
)
else:
escoria.logger.trace(
self,
"No player loaded for current scene. Ignoring left double-click on background."
)
# Called when an element in the scene was focused # Called when an element in the scene was focused
# (Needs to be overridden, if supported) # (Needs to be overridden, if supported)