diff options
| -rw-r--r-- | client/menu/ingame.gd | 2 | ||||
| -rw-r--r-- | client/menu/menu.gd | 1 | ||||
| -rw-r--r-- | client/menu/setup.gd | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/client/menu/ingame.gd b/client/menu/ingame.gd index 306b15b2..c1661491 100644 --- a/client/menu/ingame.gd +++ b/client/menu/ingame.gd @@ -23,7 +23,7 @@ func _on_main_menu_pressed(): parent_menu.replace_menu("res://menu/main.tscn") func _on_settings_pressed(): - submenu("res://menu/settings.tscn") + submenu("res://menu/settings.tscn", true) func _on_reconnect_pressed(): parent_menu.replace_menu("res://menu/game.tscn") diff --git a/client/menu/menu.gd b/client/menu/menu.gd index a911ca83..5e7ba34c 100644 --- a/client/menu/menu.gd +++ b/client/menu/menu.gd @@ -54,6 +54,7 @@ func quit(): get_parent().quit() 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()) diff --git a/client/menu/setup.gd b/client/menu/setup.gd index c5080920..80a3f6c8 100644 --- a/client/menu/setup.gd +++ b/client/menu/setup.gd @@ -13,7 +13,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. # -extends Control +extends Menu @onready var anim: AnimationPlayer = $AnimationPlayer @onready var username: LineEdit = $ScrollContainer/Control/TextureRect/PaperMargin/Contents/NameEntry/LineEdit @@ -46,4 +46,4 @@ func _on_sign_pressed(): Global.set_setting("setup_complete", true) Global.save_profile() Global.save_settings() - $SceneTransition.transition_to("res://menu/menu_manager.tscn") + replace_menu("res://menu/main.tscn") |