summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Del Campo Romero <xavi92@disroot.org>2026-11-18 01:29:29 +0100
committerXavier Del Campo Romero <xavi92@disroot.org>2026-11-18 01:29:29 +0100
commit2e0d47525ceb7cd9e6905860eb15f57132e6c9a0 (patch)
tree476227b0772a536b04cebb248030c642904ce3f7
parentd42bf563c5e7a3935400bc06a835e160b161503c (diff)
downloadnj26-2e0d47525ceb7cd9e6905860eb15f57132e6c9a0.tar.gz
Remove music from game scene
-rw-r--r--Spatial.gd6
-rw-r--r--Spatial.tscn6
-rw-r--r--credits.gd4
-rw-r--r--select.gd2
4 files changed, 2 insertions, 16 deletions
diff --git a/Spatial.gd b/Spatial.gd
index 0b4c4b7..35e218f 100644
--- a/Spatial.gd
+++ b/Spatial.gd
@@ -188,12 +188,6 @@ func start_game():
func go_back():
get_tree().root.remove_child(self)
-func set_music_pos(pos):
- $music.play(pos)
-
-func loop():
- $music.play()
-
func set_players(players):
create_zombie(0, players[0], t.Team.GREEN, Vector3(-6.0, 0, -3))
create_zombie(1, players[1], t.Team.GREEN, Vector3(-6.0, 0, 3))
diff --git a/Spatial.tscn b/Spatial.tscn
index d8ec39e..af9c626 100644
--- a/Spatial.tscn
+++ b/Spatial.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=27 format=2]
+[gd_scene load_steps=26 format=2]
[ext_resource path="res://floor.png" type="Texture" id=1]
[ext_resource path="res://sky.tscn" type="PackedScene" id=2]
@@ -7,7 +7,6 @@
[ext_resource path="res://basefloor.gd" type="Script" id=5]
[ext_resource path="res://vera/Vera.ttf" type="DynamicFontData" id=6]
[ext_resource path="res://vera/VeraBd.ttf" type="DynamicFontData" id=7]
-[ext_resource path="res://music.mp3" type="AudioStream" id=8]
[ext_resource path="res://sfx/p0/Power Up.wav" type="AudioStream" id=9]
[ext_resource path="res://sfx/p1/Power Up.wav" type="AudioStream" id=10]
[ext_resource path="res://sfx/p2/Power Up.wav" type="AudioStream" id=11]
@@ -247,9 +246,6 @@ transform = Transform( 15, 0, 0, 0, 10.6066, 10.6066, 0, -10.6066, 10.6066, 0, 0
[node name="box_timer" type="Timer" parent="."]
-[node name="music" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 8 )
-
[node name="powerup" type="Node" parent="."]
[node name="p0" type="AudioStreamPlayer" parent="powerup"]
diff --git a/credits.gd b/credits.gd
index f15f596..69d08c3 100644
--- a/credits.gd
+++ b/credits.gd
@@ -10,10 +10,6 @@ func back():
func set_music_pos(pos):
$music.play(pos)
-func loop():
- $music.play()
-
func _ready():
var __
__ = $CanvasLayer/CenterContainer3/back.connect("button_up", self, "back")
- __ = $music.connect("finished", self, "loop")
diff --git a/select.gd b/select.gd
index 682351e..5ba9bbc 100644
--- a/select.gd
+++ b/select.gd
@@ -28,8 +28,8 @@ var accepted: Array = [false, false, false, false]
func start():
game.set_players(players)
+ $music.stop()
get_tree().root.add_child(game)
- game.set_music_pos($music.get_playback_position())
get_tree().root.remove_child(self)
func back():