Fix erroneous/useless [event] in [titlescreen_music], [lobby_music], …

…[editor_music] The playlist macros set the music list twice, once before the story screen and again in prestart, but the order of tracks is different. This means that the track order at the titlescreen and in the lobby is now the same as the track order in a scenario using the default playlist, which previously was not the case. Similarly, the track order in the editor is now the same as the track order in a scenario using the full playlist. Whether that actually matters? I have no idea. I doubt it. In any case, as of this commit, there are no schema validation errors at the title screen, when entering the MP Create screen, or in the map editor.
wesnoth · Apr 12, 2018 · d0e4151 · d0e4151
1 parent 28db261
commit d0e4151
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 301 deletions.
diff --git a/data/core/editor/_main.cfg b/data/core/editor/_main.cfg
@@ -1,5 +1,4 @@
 #textdomain wesnoth-editor
-# Main purpose of this file is to ensure that macros get read in first.
 
 # wmlscope: set export=yes
 
@@ -15,7 +14,7 @@
 #endif
 
 [titlescreen_music]
-    {DEFAULT_MUSIC_PLAYLIST}
+    {DEFAULT_MUSIC_PLAYLIST_NO_EVENT}
     [music]
         name=main_menu.ogg
         ms_before=12000

diff --git a/data/core/editor/music.cfg b/data/core/editor/music.cfg
@@ -2,5 +2,5 @@
 # Defines the music playlist for the editor
 
 [editor_music]
-    {FULL_MUSIC_PLAYLIST}
+    {FULL_MUSIC_PLAYLIST_NO_EVENT}
 [/editor_music]
diff --git a/data/core/macros/sound-utils.cfg b/data/core/macros/sound-utils.cfg
@@ -16,10 +16,7 @@
 
 # These macros do not rely on any other macros.  Please don't change this.
 
-#define DEFAULT_MUSIC_PLAYLIST
-    # A macro to define a standard playlist suitable for any level.  The
-    # music is defined twice to catch instances where music is changed in
-    # a story and not set back.
+#define DEFAULT_MUSIC_PLAYLIST_NO_EVENT
     [music]
         name=knolls.ogg
         ms_before=12000
@@ -144,139 +141,17 @@
         ms_before=12000
         append=yes
     [/music]
+#enddef
+
+#define DEFAULT_MUSIC_PLAYLIST
+    {DEFAULT_MUSIC_PLAYLIST_NO_EVENT}
     [event]
         name=prestart
-        [music]
-            name=knolls.ogg
-            ms_before=12000
-        [/music]
-        [music]
-            name=wanderer.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=battle.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=transience.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=revelation.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=loyalists.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=the_king_is_dead.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=knalgan_theme.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=the_city_falls.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=nunc_dimittis.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=breaking_the_chains.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=elvish-theme.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=legends_of_the_north.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=traveling_minstrels.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=underground.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=vengeful.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=frantic.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=the_dangerous_symphony.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=heroes_rite.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=suspense.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=the_deep_path.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=siege_of_laurelmor.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=casualties_of_war.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=silvan_sanctuary.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=battle-epic.ogg
-            ms_before=12000
-            append=yes
-        [/music]
+        {DEFAULT_MUSIC_PLAYLIST_NO_EVENT}
     [/event]
 #enddef
 
-#define FULL_MUSIC_PLAYLIST
-    # A macro to define a playlist of all tracks in alphabetical order.  The
-    # music is defined twice to catch instances where music is changed in
-    # a story and not set back
+#define FULL_MUSIC_PLAYLIST_NO_EVENT
     [music]
         name=battle-epic.ogg
         title= _ "Battle Epic"
@@ -475,173 +350,13 @@
         ms_before=12000
         append=yes
     [/music]
+#enddef
+
+#define FULL_MUSIC_PLAYLIST
+    {FULL_MUSIC_PLAYLIST_NO_EVENT}
     [event]
         name=prestart
-        [music]
-            name=battle-epic.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=battle.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=breaking_the_chains.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=casualties_of_war.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=elf-land.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=elvish-theme.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=frantic.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=heroes_rite.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=into_the_shadows.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=journeys_end.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=knalgan_theme.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=knolls.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=legends_of_the_north.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=love_theme.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=loyalists.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=northern_mountains.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=northerners.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=nunc_dimittis.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=revelation.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=sad.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=siege_of_laurelmor.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=silvan_sanctuary.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=suspense.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=the_city_falls.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=the_dangerous_symphony.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=the_deep_path.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=the_king_is_dead.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=transience.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=traveling_minstrels.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=underground.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=vengeful.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=wanderer.ogg
-            ms_before=12000
-            append=yes
-        [/music]
-        [music]
-            name=weight_of_revenge.ogg
-            ms_before=12000
-            append=yes
-        [/music]
+        {FULL_MUSIC_PLAYLIST_NO_EVENT}
     [/event]
 #enddef
 

diff --git a/data/multiplayer/_main.cfg b/data/multiplayer/_main.cfg
@@ -15,7 +15,7 @@
 {multiplayer/scenarios/}
 
 [lobby_music]
-    {DEFAULT_MUSIC_PLAYLIST}
+    {DEFAULT_MUSIC_PLAYLIST_NO_EVENT}
     [music]
         name=main_menu.ogg
         ms_before=12000