From 54c15592f7b879f05575a3777c89b849e10dbff0 Mon Sep 17 00:00:00 2001 From: fendrin Date: Sat, 7 Jun 2014 16:49:21 +0200 Subject: [PATCH] Put the DEFAULT_SCHEDULE_* macros in use. --- data/multiplayer/scenarios/2p_Dark_Forecast.cfg | 7 +------ data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg index f0d75317c628..68539506091f 100644 --- a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg +++ b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg @@ -999,12 +999,7 @@ Note: You need to use the default map settings for the scenario to work right." [/event] #enddef - {DAWN} - {MORNING} - {AFTERNOON} - {DUSK} - {FIRST_WATCH} - {SECOND_WATCH} + {DEFAULT_SCHEDULE_DAWN} [side] side=1 diff --git a/data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg b/data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg index abbd9fa0750e..4ace81b3ca33 100644 --- a/data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg +++ b/data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg @@ -8,12 +8,7 @@ map_data="{multiplayer/maps/9p_Merkwuerdigliebe.map}" description= _ "A very small 3 vs. 3 vs. 3 map. A 60sec timer is recommended due to the large number of players. The teams are players 159 vs. 267 vs. 348 (north vs. southeast vs. southwest). There are very few villages per player, so 3 gold per villages is recommended." - {MORNING} - {AFTERNOON} - {DUSK} - {FIRST_WATCH} - {SECOND_WATCH} - {DAWN} + {DEFAULT_SCHEDULE_MORNING} {DEFAULT_MUSIC_PLAYLIST}