diff options
author | metamuffin <metamuffin@disroot.org> | 2024-07-08 23:34:39 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-07-08 23:34:39 +0200 |
commit | ce70568ab5b62814be4fbfa406a4eb81d4e8643e (patch) | |
tree | 40f44e8d7b46ccee2ed09e4b8d9f163804c4b90c | |
parent | 04e46e9bfc7fed7b9954735284c09a4eb8a90952 (diff) | |
download | hurrycurry-ce70568ab5b62814be4fbfa406a4eb81d4e8643e.tar hurrycurry-ce70568ab5b62814be4fbfa406a4eb81d4e8643e.tar.bz2 hurrycurry-ce70568ab5b62814be4fbfa406a4eb81d4e8643e.tar.zst |
reapply: stupid fix for pause menu closing on open
-rw-r--r-- | client/menu/game.gd | 1 | ||||
-rw-r--r-- | client/menu/menu.gd | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/client/menu/game.gd b/client/menu/game.gd index de496def..362bf169 100644 --- a/client/menu/game.gd +++ b/client/menu/game.gd @@ -25,5 +25,6 @@ func _input(_event): open_ingame_menu() func open_ingame_menu(): + if popup != null: return Sound.play_click() submenu("res://menu/ingame.tscn") diff --git a/client/menu/menu.gd b/client/menu/menu.gd index 65ffa708..5d6946cf 100644 --- a/client/menu/menu.gd +++ b/client/menu/menu.gd @@ -28,8 +28,10 @@ signal submenu_close() const transition_scene = preload("res://menu/scene_transition.tscn") var transition: SceneTransition var parent_menu: Menu = null +var open_since func _ready(): + open_since = Time.get_ticks_msec() focus_first(self) connect_button_sounds(self) update_parent_menu(self.get_parent()) @@ -117,6 +119,7 @@ func update_parent_menu(node: Node): func _input(_event): if popup != null: return + if Time.get_ticks_msec() - open_since < 100: return if Input.is_action_just_pressed("ui_cancel"): Sound.play_click() exit() |