Merge branch 'master' of https://codeberg.org/metamuffin/undercooked

1 files changed, 10 insertions, 2 deletions

diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd
index 8361ca6a..f4c793ae 100644
--- a/client/player/controllable_player.gd
+++ b/client/player/controllable_player.gd
@@ -29,6 +29,7 @@ var facing = Vector2(1, 0)
 var velocity_ = Vector2(0, 0)
 var stamina = 0
 var chat_open := false
+var enable_input := true
 
 var target: Vector2i = Vector2i(0, 0)
 
@@ -39,7 +40,8 @@ func _ready():
 	add_child(timer)
 	timer.start()
 	timer.connect("timeout", func():
-		game.mp.send_position(position_, rotation_, boosting)
+		if game.mp != null:
+			game.mp.send_position(position_, rotation_, boosting)
 	)
 	add_child(onscreen_controls)
 	super()
@@ -52,6 +54,7 @@ func _input(_event):
 		else:
 			chat_bubble.edit()
 		chat_open = !chat_open
+		enable_input = !enable_input
 
 const MAX_DT = 1./50.
 func _process(delta):
@@ -62,7 +65,7 @@ func _process(delta):
 	super(delta)
 
 func _process_movement(delta):
-	var input = Input.get_vector("left", "right", "forward", "backwards")
+	var input = Input.get_vector("left", "right", "forward", "backwards") if enable_input else Vector2.ZERO
 	var boost = Input.is_action_pressed("boost") or (Global.get_setting("latch_boost") and boosting)
 	input = input.rotated( - game.camera.angle_target)
 	if Input.is_action_pressed("interact") or Input.is_action_just_released("interact"):
@@ -145,6 +148,8 @@ func take_item(tile: Tile):
 	Input.start_joy_vibration(0, 0.1, 0.0, 0.075)
 
 func interact():
+	if not enable_input:
+		return
 	var tile = game.map.get_tile_instance(target)
 	if tile != null:
 		game.marker.set_interactive(game.get_tile_interactive(target))
@@ -157,3 +162,6 @@ func interact():
 			game.mp.send_tile_interact(target, false)
 	else:
 		game.marker.visible = false
+
+func set_input_enabled(b: bool):
+	enable_input = b