From 29f643de20ef3ecd68a99b10c571ee8e25a700a6 Mon Sep 17 00:00:00 2001 From: John Breaux Date: Sun, 31 Oct 2021 19:21:23 -0500 Subject: [PATCH] Load options on OptionController _ready(), so they will be available before options menu opens. Disable debug printout on loading scene using main bus signal. Cleanup formatting on Debug 'call' command output. --- godot_ship/script/debug/debug_menu.gd | 4 ++-- godot_ship/script/game/Main.gd | 2 +- godot_ship/script/options/OptionsController.gd | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/godot_ship/script/debug/debug_menu.gd b/godot_ship/script/debug/debug_menu.gd index 6ef4b42..175d573 100644 --- a/godot_ship/script/debug/debug_menu.gd +++ b/godot_ship/script/debug/debug_menu.gd @@ -333,8 +333,8 @@ func command_call(command): debug_print_line("We're sorry, but your call could not be completed as dialed.\n" + "Please hang up and try your call again.\n") return - if (call_ret): - debug_print_line("'" + String(call_ret) + "'\n") + if (call_ret != null): + debug_print_line(String(call_ret) + "\n") else: debug_print_line("null\n") else: diff --git a/godot_ship/script/game/Main.gd b/godot_ship/script/game/Main.gd index f2c99d9..238d6e2 100644 --- a/godot_ship/script/game/Main.gd +++ b/godot_ship/script/game/Main.gd @@ -42,7 +42,7 @@ func _process(_delta): # Creates a new instance of each menu scene func _on_scene_start(scene): - print ("_on_scene_start(",scene,")") + #print ("_on_scene_start(",scene,")") match scene: "Singleplayer": add_child (gameplay.instance()) diff --git a/godot_ship/script/options/OptionsController.gd b/godot_ship/script/options/OptionsController.gd index f35ac18..62169d8 100644 --- a/godot_ship/script/options/OptionsController.gd +++ b/godot_ship/script/options/OptionsController.gd @@ -14,7 +14,7 @@ var mus_vol = 100 var sfx_vol = 100 func _ready(): - pass + load_options() # Setters func set_theme(theme_name):