aboutsummaryrefslogtreecommitdiff
path: root/client/menu
diff options
context:
space:
mode:
Diffstat (limited to 'client/menu')
-rw-r--r--client/menu/character.gd11
-rw-r--r--client/menu/hairstyle_preview.gd2
2 files changed, 6 insertions, 7 deletions
diff --git a/client/menu/character.gd b/client/menu/character.gd
index 67087b76..dd3bc5cd 100644
--- a/client/menu/character.gd
+++ b/client/menu/character.gd
@@ -18,7 +18,6 @@
extends Menu
@onready var character: Character = $Node3D/Character
-@onready var num_hairstyles := character.hairstyles.keys().size()
@onready var back_button := $VBoxContainer/bottom_panel/back
@onready var map: Map = $Node3D/Map
@onready var username_edit = $VBoxContainer/top_panel/a/username
@@ -26,7 +25,7 @@ extends Menu
func _ready():
super()
$VBoxContainer/top_panel/a/username.text = Global.get_profile("username")
- character.select_hairstyle(Global.get_profile("character"))
+ character.set_style(Global.get_profile("character"))
init_map()
func init_map():
@@ -69,9 +68,9 @@ func _on_back_pressed():
replace_menu("res://menu/main.tscn")
func _on_character_back_pressed():
- Global.set_profile("character", (Global.get_profile("character") - 1) % num_hairstyles)
- character.select_hairstyle(Global.get_profile("character"))
+ Global.set_profile("character", max(Global.get_profile("character") - 1, 0))
+ character.set_style(Global.get_profile("character"))
func _on_character_forward_pressed():
- Global.set_profile("character", (Global.get_profile("character") + 1) % num_hairstyles)
- character.select_hairstyle(Global.get_profile("character"))
+ Global.set_profile("character", max(Global.get_profile("character") + 1, 0))
+ character.set_style(Global.get_profile("character"))
diff --git a/client/menu/hairstyle_preview.gd b/client/menu/hairstyle_preview.gd
index 5a9cce68..08b6aab9 100644
--- a/client/menu/hairstyle_preview.gd
+++ b/client/menu/hairstyle_preview.gd
@@ -19,7 +19,7 @@ extends VBoxContainer
signal selected(character: int)
func setup(character: int, group: ButtonGroup):
- $HairViewport/Node3D/Character.select_hairstyle(character)
+ $HairViewport/Node3D/Character.set_style(character)
$Select.button_group = group
$Select.text = tr("c.setup.uniform.value").format([character + 1])
$Select.pressed.connect(func(): selected.emit(character))