Merge pull request #8876 from pchote/music

Refine the music playlist code.
2015-08-02 15:49:13 +02:00
parent 4b6c37f90f 1d307bfe07
commit 9e2f06aa2d
15 changed files with 128 additions and 83 deletions
--- a/mods/ts/audio/music.yaml
+++ b/mods/ts/audio/music.yaml
@@ -1,5 +1,6 @@
 #Tiberian Sun
 intro: Intro
+	Hidden: true
 approach: Approach
 defense: The Defense
 duskhour: Dusk Hour
@@ -14,12 +15,14 @@ nodcrush: Nod Crush
 pharotek: Pharotek
 redsky: Red Sky
 score: Score
+	Hidden: true
 scout: Scouting
 storm: Storm
 timebomb: Timebomb
 valves1b: Valves
 whatlurk: What Lurks
 maps: Map Selection
+	Hidden: true
 #Firestorm
 dmachine: Deploy Machines
 elusive: Elusive
--- a/mods/ts/maps/blank-shellmap/map.yaml
+++ b/mods/ts/maps/blank-shellmap/map.yaml
@@ -41,8 +41,7 @@ Rules:
 		-SpawnMPUnits:
 		-MPStartLocations:
 		MusicPlaylist:
-			StartingMusic: intro
-			LoopStartingMusic: True
+			BackgroundMusic: intro

 Sequences: