diff --git a/Global_InGame.gd b/Global_InGame.gd index 74f1521..4ad1502 100644 --- a/Global_InGame.gd +++ b/Global_InGame.gd @@ -1,5 +1,5 @@ extends Node2D -const gamevariables = "res://MiscScenes/GameVariables.tscn" +const game_variables = "res://MiscScenes/GameVariables.tscn" func RenderSpeech(load_on, text): var speech = preload("res://MiscScenes/Speech.tscn").instance() @@ -8,7 +8,7 @@ func RenderSpeech(load_on, text): load_on.add_child(speech) func SoundOnInteraction(load_on, sound_name): - var audio = preload(gamevariables).instance().get_node("Sound") - audio.stream = load("res://Sounds/%s.wav" % sound_name) + var audio = preload(game_variables).instance() + audio.get_node("Sound").stream = load("res://Sounds/%s.wav" % sound_name) load_on.add_child(audio) Global.Log("Sound playing "+sound_name, 1) diff --git a/default_bus_layout.tres b/default_bus_layout.tres deleted file mode 100644 index bb52f57..0000000 --- a/default_bus_layout.tres +++ /dev/null @@ -1,10 +0,0 @@ -[gd_resource type="AudioBusLayout" format=2] - -[resource] -bus/0/solo = true -bus/1/name = "New Bus" -bus/1/solo = false -bus/1/mute = false -bus/1/bypass_fx = false -bus/1/volume_db = 6.02 -bus/1/send = "Master" diff --git a/project.godot b/project.godot index e05cb6a..c10c4c8 100644 --- a/project.godot +++ b/project.godot @@ -24,12 +24,17 @@ config/name="Ring of Races demo" run/main_scene="res://MiscScenes/Menu.tscn" config/icon="res://pictures/gui/buttons/delete_ringofraces.png" +[audio] + +default_bus_layout="" + [autoload] Global="*res://Global.gd" Database="*res://Storage/Database.gd" GlobalStructures="*res://Global_structures.gd" GlobalGameFunctions="*res://Global_InGame.gd" +GameVariables="*res://MiscScenes/GameVariables.tscn" [display]