3 files changed, 11 insertions, 1 deletions
diff --git a/client/player/character/character.gd b/client/player/character/character.gd
index c6ca9b50..224eb356 100644
--- a/client/player/character/character.gd
+++ b/client/player/character/character.gd
@@ -60,6 +60,8 @@ func _process(delta):
 		play_animation(next_animation)
 
 func select_hairstyle(id: int):
+	if id < 0:
+		id *= -1 # TODO: Select customer character
 	var target = hairstyles.keys()[id]
 	for k in hairstyles.keys():
 		if k == target:
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd
index c4691b67..903f22c7 100644
--- a/client/player/controllable_player.gd
+++ b/client/player/controllable_player.gd
@@ -34,6 +34,7 @@ func _ready():
 	timer.connect("timeout", func():
 		game.mp.send_position(position_, rotation_)
 	)
+	super()
 
 func _process(delta):
 	var input = Vector2(Input.get_axis("left", "right"), Input.get_axis("forward", "backwards")).normalized()
diff --git a/client/player/player.gd b/client/player/player.gd
index 4a5cfa6a..4806b19d 100644
--- a/client/player/player.gd
+++ b/client/player/player.gd
@@ -32,12 +32,13 @@ var bubble: ChatBubble = preload("res://player/chat_bubble.tscn").instantiate()
 
 var hand: Item = null
 var hand_base: Node3D = Node3D.new()
+var character_idx: int
 
 var _anim_angle: float = 0.0
 
 const HAND_BASE_POSITION: Vector3 = Vector3(0, .25, .4)
 
-func _init(_id: int, new_name: String, pos: Vector2, _character: int, new_game: Game):
+func _init(_id: int, new_name: String, pos: Vector2, new_character_idx: int, new_game: Game):
 	add_child(character)
 	position_ = pos
 	name = new_name
@@ -47,6 +48,12 @@ func _init(_id: int, new_name: String, pos: Vector2, _character: int, new_game:
 	add_child(hand_base)
 
 	add_child(bubble)
+	
+	character_idx = new_character_idx
+	
+
+func _ready():
+	character.select_hairstyle(character_idx)
 
 func update_position(new_position: Vector2, new_rotation: float):
 	position_ = new_position