diff options
| -rw-r--r-- | client/menu/game.gd | 1 | ||||
| -rw-r--r-- | client/menu/ingame.gd | 4 | ||||
| -rw-r--r-- | client/menu/menu.gd | 13 | ||||
| -rw-r--r-- | server/src/customer/mod.rs | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/client/menu/game.gd b/client/menu/game.gd index ae44957a..ee8743f4 100644 --- a/client/menu/game.gd +++ b/client/menu/game.gd @@ -5,4 +5,5 @@ func _ready(): func _input(_event): if Input.is_action_just_pressed("pause"): + Sound.play_click() submenu("res://menu/ingame.tscn") diff --git a/client/menu/ingame.gd b/client/menu/ingame.gd index fb108c70..f8d4d144 100644 --- a/client/menu/ingame.gd +++ b/client/menu/ingame.gd @@ -32,7 +32,3 @@ func _on_reconnect_pressed(): func _on_quit_pressed(): quit() - -func _input(event): - if Time.get_ticks_msec() - opened < 100: return # TODO: Prevent close from same action as open - if Input.is_action_just_pressed("pause"): exit() diff --git a/client/menu/menu.gd b/client/menu/menu.gd index 2c539bd9..c0d0fce6 100644 --- a/client/menu/menu.gd +++ b/client/menu/menu.gd @@ -59,7 +59,9 @@ func replace_menu(path: String): print("Replace menu: ", path) if popup != null: await popup.exit() await menu_anim_exit() - get_parent().add_child(load(path).instantiate()) + var new_popup = load(path).instantiate() + get_parent().add_child(new_popup) + if parent_menu != null: parent_menu.popup = new_popup queue_free() var focus_auto_changed := false @@ -86,7 +88,8 @@ func update_parent_menu(node: Node): if node is Menu: parent_menu = node elif node.get_parent() != null: update_parent_menu(node.get_parent()) -#func _input(_event): - #if Input.is_action_just_pressed("ui_cancel"): - #Sound.play_click() - #exit() +func _input(_event): + if popup != null: return + if Input.is_action_just_pressed("ui_cancel"): + Sound.play_click() + exit() diff --git a/server/src/customer/mod.rs b/server/src/customer/mod.rs index 8e6f1db6..9e0dd797 100644 --- a/server/src/customer/mod.rs +++ b/server/src/customer/mod.rs @@ -118,7 +118,7 @@ impl DemandState { id, PacketS::Join { name: faker::name::fr_fr::Name().fake(), - character: -2, + character: -1 - (random::<i16>() as i32), }, )); let chair = self.select_chair().ok_or(anyhow!("no free chair found"))?; |