From 1ab12108816ce0d39853aff345f6e15c247c82c4 Mon Sep 17 00:00:00 2001 From: VAILLANT Jeremy Date: Sun, 23 May 2021 21:33:44 +0200 Subject: [PATCH] Fix word ambient -> ambient --- db/MSetting.gd | 14 +++++++------- scenes/Global.gd | 8 ++++---- scenes/UI/settings/Settings.gd | 12 ++++++------ scenes/levels/warcraft/WarCraft.gd | 10 +++++----- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/db/MSetting.gd b/db/MSetting.gd index 057f8a0..05ba0e6 100644 --- a/db/MSetting.gd +++ b/db/MSetting.gd @@ -2,7 +2,7 @@ extends "res://db/MBase.gd" var m_langue = { "id": null, "value": null } var m_gyroscope = { "id": null, "value": null } -var m_ambiant_sound = { "id": null, "value": null } +var m_ambient_sound = { "id": null, "value": null } const ROW = 0 @@ -12,7 +12,7 @@ func _init(): m_langue = _get_data_info(datas, 0) m_gyroscope = _get_data_info(datas, 1) - m_ambiant_sound = _get_data_info(datas, 2) + m_ambient_sound = _get_data_info(datas, 2) func _get_data_info(datas, id): return { @@ -26,8 +26,8 @@ func get_langue(): func get_gyroscope(): return int(m_gyroscope["value"]) as bool -func get_ambiant_sound(): - return int(m_ambiant_sound["value"]) as bool +func get_ambient_sound(): + return int(m_ambient_sound["value"]) as bool func set_langue(value): m_langue["value"] = _set_data(value, m_langue["id"], gddb_types.e_prop_type_string) @@ -39,7 +39,7 @@ func set_gyroscope(value): return get_gyroscope() -func set_ambiant_sound(value): - m_ambiant_sound["value"] = _set_data(value, m_ambiant_sound["id"], gddb_types.e_prop_type_bool) +func set_ambient_sound(value): + m_ambient_sound["value"] = _set_data(value, m_ambient_sound["id"], gddb_types.e_prop_type_bool) - return get_ambiant_sound() + return get_ambient_sound() diff --git a/scenes/Global.gd b/scenes/Global.gd index 834d8c5..c281548 100644 --- a/scenes/Global.gd +++ b/scenes/Global.gd @@ -45,11 +45,11 @@ func get_setting_gyrosocpe(): func set_setting_gyroscope(value): setting.set_gyroscope(value) -func get_setting_ambiant_sound(): - return setting.get_ambiant_sound() +func get_setting_ambient_sound(): + return setting.get_ambient_sound() -func set_setting_ambiant_sound(value): - setting.set_ambiant_sound(value) +func set_setting_ambient_sound(value): + setting.set_ambient_sound(value) func _process(_delta): print("[global#_process]") diff --git a/scenes/UI/settings/Settings.gd b/scenes/UI/settings/Settings.gd index bdc64b9..4d2ebea 100644 --- a/scenes/UI/settings/Settings.gd +++ b/scenes/UI/settings/Settings.gd @@ -5,7 +5,7 @@ func _ready(): _translation() _apply_settings_language() _apply_settings_gyroscope() - _apply_settings_sound_ambiant() + _apply_settings_sound_ambient() ## PRIVATE func _translation(): @@ -18,13 +18,13 @@ func _apply_settings_language(): func _apply_settings_gyroscope(): $VBoxContainer/gyroscope/HBoxContainer/data.set_pressed(Global.get_setting_gyrosocpe()) -func _apply_settings_sound_ambiant(): - $VBoxContainer/ambiant_sound/HBoxContainer/data.set_pressed(Global.get_setting_ambiant_sound()) +func _apply_settings_sound_ambient(): + $VBoxContainer/ambient_sound/HBoxContainer/data.set_pressed(Global.get_setting_ambient_sound()) func _on_gyroscope_pressed(): print("[Settings#_on_gyroscope_pressed] change value to database ...........") Global.set_setting_gyroscope(int($VBoxContainer/gyroscope/HBoxContainer/data.pressed)) -func _on_ambiant_sound_pressed(): - print("[Settings#_on_ambiant_sound_pressed] change value to database ...........") - Global.set_setting_ambiant_sound(int($VBoxContainer/ambiant_sound/HBoxContainer/data.pressed)) +func _on_ambient_sound_pressed(): + print("[Settings#_on_ambient_sound_pressed] change value to database ...........") + Global.set_setting_ambient_sound(int($VBoxContainer/ambient_sound/HBoxContainer/data.pressed)) diff --git a/scenes/levels/warcraft/WarCraft.gd b/scenes/levels/warcraft/WarCraft.gd index 4b9c09e..2cb4b9e 100644 --- a/scenes/levels/warcraft/WarCraft.gd +++ b/scenes/levels/warcraft/WarCraft.gd @@ -8,7 +8,7 @@ onready var last_btn = null func _ready(): _display_hud_menu() - _play_ambiant_sound() + _play_ambient_sound() func _display_hud_menu(): var counter = 0 @@ -46,7 +46,7 @@ func _create_button_info(scene, counter, label_id): last_btn = btn -func _play_ambiant_sound(): - if Global.get_setting_ambiant_sound(): - $AmbiantSound.play() - $AmbiantSound.stream_paused = false +func _play_ambient_sound(): + if Global.get_setting_ambient_sound(): + $AmbientSound.play() + $AmbientSound.stream_paused = false