Merge pull request #77 from Linuxiness/devel-group1-1

elon musk song
lnxfsf · Apr 25, 2023 · a6068b7 · a6068b7
2 parents b934754 + d02d2a8
commit a6068b7
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/main.py b/main.py
@@ -213,7 +213,7 @@ def collide(obj1, obj2):
 def background_music():
     # background music
     mixer.init()                     # Starting the mixer
-    mixer.music.load(os.path.join("music", "Sadder_Days_Omelas_Snippet_.ogg"))     # Loading the song 
+    mixer.music.load(os.path.join("music", "Elon-Musk-dont-doubt-your-vibe.ogg"))     # Loading the song 
     mixer.music.set_volume(0.7)      # Setting the volume
     mixer.music.play()               # Start playing the song
 
@@ -331,7 +331,7 @@ def main():
 
     # background music 
     #               UNCOMMENT THIS, WHEN YOU START WORKING ON IT
-    # background_music()
+    background_music()
 
     # game states
     run = True

diff --git a/music/Elon-Musk-dont-doubt-your-vibe.ogg b/music/Elon-Musk-dont-doubt-your-vibe.ogg
diff --git a/music/FLY5OLO-Deadman_Working.ogg b/music/FLY5OLO-Deadman_Working.ogg
diff --git a/music/King_plague b/music/King_plague
diff --git a/music/NOMINAL-EVERYDAY_ANYONE.ogg b/music/NOMINAL-EVERYDAY_ANYONE.ogg
diff --git a/music/Sadder_Days_Omelas_Snippet_.ogg b/music/Sadder_Days_Omelas_Snippet_.ogg