changed the name of the macro for the default music playlist

from {DEFAULT_MP_MUSIC_PLAYLIST} to {DEFAULT_MUSIC_PLAYLIST}
2006-03-17 22:30:46 +00:00 · 2006-03-17 22:30:46 +00:00 · ea0549d528
commit ea0549d528
parent 472dc35894
57 changed files with 57 additions and 57 deletions
--- a/2
+++ b/2
@ -121,7 +121,7 @@ SVN trunk (1.1.1+svn):
 * WML improvements
   * [if] now supports [and] and [not] tags
   * new {IS_HERO} macro to display a hero icon for new units
-   * new {DEFAULT_MP_MUSIC_PLAYLIST} macro to specify gamemusic 01 to 03 and
+   * new {DEFAULT_MUSIC_PLAYLIST} macro to specify gamemusic 01 to 03 and
     main_menu.ogg as playlist
   * moved much of about into WML as well as enabled campaign [about]
   * added a #undef preprocessor directive
--- a/data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg
@ -16,7 +16,7 @@

 	next_scenario=Escape_Tunnel

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/02.The_Escape_Tunnel.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/02.The_Escape_Tunnel.cfg
@ -9,7 +9,7 @@ map_data="{campaigns/Eastern_Invasion/maps/The_Escape_Tunnel}"

 next_scenario=Unexpected_Appearance

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/03.An_Unexpected_Appearance.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/03.An_Unexpected_Appearance.cfg
@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/04a.An_Elven_Alliance.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/04a.An_Elven_Alliance.cfg
@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/04b.The_Undead_Border_Patrol.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/04b.The_Undead_Border_Patrol.cfg
@ -12,7 +12,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg
@ -17,7 +17,7 @@

 	next_scenario=Northern_Outpost

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
@ -6,7 +6,7 @@ map_data="{campaigns/Eastern_Invasion/maps/Northern_Outpost}"
 turns=20
 next_scenario=Two_Paths
 victory_when_enemies_defeated=no
-{DEFAULT_MP_MUSIC_PLAYLIST}
+{DEFAULT_MUSIC_PLAYLIST}

 	{DAWN}
 	{MORNING}
--- a/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg
@ -3,7 +3,7 @@ id=Two_Paths
 #textdomain wesnoth-ei
 name= _ "Two Paths"
 map_data="{campaigns/Eastern_Invasion/maps/Two_Paths}"
-{DEFAULT_MP_MUSIC_PLAYLIST}
+{DEFAULT_MUSIC_PLAYLIST}
 next_scenario=Crossing
 {TURNS 18 16 14}

--- a/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg
@ -5,7 +5,7 @@ name= _ "Undead Crossing"
 map_data="{campaigns/Eastern_Invasion/maps/Undead_Crossing}"
 turns=18
 next_scenario=Ogre
-{DEFAULT_MP_MUSIC_PLAYLIST}
+{DEFAULT_MUSIC_PLAYLIST}

 	{DAWN}
 	{MORNING}
--- a/data/campaigns/Eastern_Invasion/scenarios/09.Training_the_Ogres.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/09.Training_the_Ogres.cfg
@ -15,7 +15,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}
 	victory_when_enemies_defeated=no

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}
--- a/data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg
@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg
@ -14,7 +14,7 @@

 	next_scenario=Captured

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/12.Captured.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/12.Captured.cfg
@ -10,7 +10,7 @@ map_data="{campaigns/Eastern_Invasion/maps/Captured}"

 next_scenario=Evacuation

-{DEFAULT_MP_MUSIC_PLAYLIST}
+{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg
@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg
@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg
@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg
@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/17.Weldyn_Under_Attack.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/17.Weldyn_Under_Attack.cfg
@ -27,7 +27,7 @@

 	next_scenario=Duel

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	{campaigns/Eastern_Invasion/utils/deaths.cfg}

--- a/data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg
@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	[story]
 		[part]
--- a/data/campaigns/Eastern_Invasion/scenarios/18b.Weldyn_Besieged.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/18b.Weldyn_Besieged.cfg
@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}

 	[story]
 		[part]
--- a/data/campaigns/Heir_To_The_Throne/scenarios/18_Scepter_of_Fire.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/18_Scepter_of_Fire.cfg
@ -32,7 +32,7 @@ scenario_generation=cave
 		id=Scepter
 		name= _ "The Scepter of Fire"
 		map_data="{campaigns/Heir_To_The_Throne/maps/Sceptre}"
-		{DEFAULT_MP_MUSIC_PLAYLIST}
+		{DEFAULT_MUSIC_PLAYLIST}
 		{TURNS 43 40 37}
 		victory_when_enemies_defeated=no

--- a/data/scenarios/multiplayer/2p_Blitz.cfg
+++ b/data/scenarios/multiplayer/2p_Blitz.cfg
@ -23,6 +23,6 @@
 	team_name=south
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Charge.cfg
+++ b/data/scenarios/multiplayer/2p_Charge.cfg
@ -23,6 +23,6 @@
 	team_name=south
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Cynsaun_Battlefield.cfg
+++ b/data/scenarios/multiplayer/2p_Cynsaun_Battlefield.cfg
@ -25,6 +25,6 @@
 	gold=150
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Den_of_Onis.cfg
+++ b/data/scenarios/multiplayer/2p_Den_of_Onis.cfg
@ -19,6 +19,6 @@
 	team_name=north
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Divide_and_Conquer.cfg
+++ b/data/scenarios/multiplayer/2p_Divide_and_Conquer.cfg
@ -20,6 +20,6 @@
 	team_name=south
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Hamlets.cfg
+++ b/data/scenarios/multiplayer/2p_Hamlets.cfg
@ -19,6 +19,6 @@
 	team_name=south
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Hornshark_Island.cfg
+++ b/data/scenarios/multiplayer/2p_Hornshark_Island.cfg
@ -19,6 +19,6 @@
 	team_name=south
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Meteor_Lake.cfg
+++ b/data/scenarios/multiplayer/2p_Meteor_Lake.cfg
@ -19,6 +19,6 @@
 	team_name=east
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Sablestone_Delta.cfg
+++ b/data/scenarios/multiplayer/2p_Sablestone_Delta.cfg
@ -19,6 +19,6 @@
 	team_name=south
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Silverhead_Crossing.cfg
+++ b/data/scenarios/multiplayer/2p_Silverhead_Crossing.cfg
@ -19,6 +19,6 @@
 	team_name=east
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Sullas_Ruins.cfg
+++ b/data/scenarios/multiplayer/2p_Sullas_Ruins.cfg
@ -19,6 +19,6 @@
 	team_name=north
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/2p_Wesbowl.cfg
+++ b/data/scenarios/multiplayer/2p_Wesbowl.cfg
@ -24,7 +24,7 @@ Defeat:
 	team_name=east
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 #define WESBOWL_UNIT SIDE FACING TYPE X Y
 	[unit]
--- a/data/scenarios/multiplayer/3p_Island_of_the_Horatii.cfg
+++ b/data/scenarios/multiplayer/3p_Island_of_the_Horatii.cfg
@ -27,6 +27,6 @@
 	team_name=west
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/3p_Morituri.cfg
+++ b/data/scenarios/multiplayer/3p_Morituri.cfg
@ -25,6 +25,6 @@
 	team_name=west
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/3p_Triple_Blitz.cfg
+++ b/data/scenarios/multiplayer/3p_Triple_Blitz.cfg
@ -25,6 +25,6 @@
 	team_name=west
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/4p_Bluewater_Province.cfg
+++ b/data/scenarios/multiplayer/4p_Bluewater_Province.cfg
@ -31,6 +31,6 @@
 	team_name=Team 1
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/4p_CastleHoppingIsle.cfg
+++ b/data/scenarios/multiplayer/4p_CastleHoppingIsle.cfg
@ -38,6 +38,6 @@
 	[/side]


-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/4p_Clash.cfg
+++ b/data/scenarios/multiplayer/4p_Clash.cfg
@ -31,6 +31,6 @@
 	controller=human
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/4p_King_of_the_Hill.cfg
+++ b/data/scenarios/multiplayer/4p_King_of_the_Hill.cfg
@ -34,6 +34,6 @@
 	[/side]


-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/4p_Lagoon.cfg
+++ b/data/scenarios/multiplayer/4p_Lagoon.cfg
@ -27,6 +27,6 @@
 	controller=human
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/4p_Loris_River.cfg
+++ b/data/scenarios/multiplayer/4p_Loris_River.cfg
@ -39,6 +39,6 @@
 	[/side]


-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/4p_Morituri.cfg
+++ b/data/scenarios/multiplayer/4p_Morituri.cfg
@ -32,6 +32,6 @@
 	[/side]


-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/4p_Paths_of_Daggers.cfg
+++ b/data/scenarios/multiplayer/4p_Paths_of_Daggers.cfg
@ -34,6 +34,6 @@
 	[/side]


-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/4p_Siege_Castles.cfg
+++ b/data/scenarios/multiplayer/4p_Siege_Castles.cfg
@ -32,6 +32,6 @@
 	[/side]


-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/4p_The_Wilderlands.cfg
+++ b/data/scenarios/multiplayer/4p_The_Wilderlands.cfg
@ -27,6 +27,6 @@
 	controller=human
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/5p_ForestOfFear.cfg
+++ b/data/scenarios/multiplayer/5p_ForestOfFear.cfg
@ -38,6 +38,6 @@
 	[/side]


-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]
--- a/data/scenarios/multiplayer/6p_Crusaders_Field.cfg
+++ b/data/scenarios/multiplayer/6p_Crusaders_Field.cfg
@ -43,7 +43,7 @@
 		controller=human
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]

--- a/data/scenarios/multiplayer/6p_Hexcake.cfg
+++ b/data/scenarios/multiplayer/6p_Hexcake.cfg
@ -43,7 +43,7 @@
 		controller=human
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]

--- a/data/scenarios/multiplayer/6p_Smallolof.cfg
+++ b/data/scenarios/multiplayer/6p_Smallolof.cfg
@ -43,7 +43,7 @@
 		controller=human
 	[/side]

-	{DEFAULT_MP_MUSIC_PLAYLIST}	
+	{DEFAULT_MUSIC_PLAYLIST}	

 [/multiplayer]

--- a/data/scenarios/multiplayer/Random_Scenario.cfg
+++ b/data/scenarios/multiplayer/Random_Scenario.cfg
@ -12,7 +12,7 @@
 	name= _ "Random map"
 	id=ranmap

-	{DEFAULT_MP_MUSIC_PLAYLIST}
+	{DEFAULT_MUSIC_PLAYLIST}
 	{DEFAULT_SCHEDULE}
 	[/scenario]
 name=default
--- a/data/scenarios/multiplayer/Random_Scenario_Desert.cfg
+++ b/data/scenarios/multiplayer/Random_Scenario_Desert.cfg
@ -11,7 +11,7 @@
 		[scenario]
 			name= _ "Random map (Desert)"
 			id=ranmap2
-		        {DEFAULT_MP_MUSIC_PLAYLIST}
+		        {DEFAULT_MUSIC_PLAYLIST}
 			{DEFAULT_SCHEDULE}
 		[/scenario]
 	name=default
--- a/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg
+++ b/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg
@ -11,7 +11,7 @@
 		[scenario]
 			name= _ "Random map (Marsh)"
 			id=ranmap4
-		        {DEFAULT_MP_MUSIC_PLAYLIST}
+		        {DEFAULT_MUSIC_PLAYLIST}
 			{DEFAULT_SCHEDULE}
 		[/scenario]
 	name=default
--- a/data/scenarios/multiplayer/Random_Scenario_Winter.cfg
+++ b/data/scenarios/multiplayer/Random_Scenario_Winter.cfg
@ -11,7 +11,7 @@
 		[scenario]
 			name= _ "Random map (Winter)"
 			id=ranmap3
-		        {DEFAULT_MP_MUSIC_PLAYLIST}
+		        {DEFAULT_MUSIC_PLAYLIST}
 			{DEFAULT_SCHEDULE}
 		[/scenario]

--- a/data/utils.cfg
+++ b/data/utils.cfg
@ -281,7 +281,7 @@ name=prestart
 flag_rgb=244,154,193,63,0,22,85,0,42,105,0,57,123,0,69,140,0,81,158,0,93,177,0,105,195,0,116,214,0,127,236,0,140,238,61,150,239,91,161,241,114,172,242,135,182,246,173,205,248,193,217,250,213,229,253,233,241
 #enddef

-#define DEFAULT_MP_MUSIC_PLAYLIST
+#define DEFAULT_MUSIC_PLAYLIST
        [music]
                name=gameplay01.ogg
                ms_before=500