From 3cb8878b9adbee7fd16d80a157747680cc83565c Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Tue, 30 Aug 2016 19:39:00 +1100
Subject: [PATCH] Fix duplicate loading of eras in mp

This fixes warnings about the era macros being redefined without being #undef-ed when
loading MP.
---
 data/_main.cfg                  | 6 +++---
 data/{multiplayer => }/eras.cfg | 4 ++--
 data/{multiplayer => }/eras.lua | 0
 data/multiplayer/_main.cfg      | 2 --
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename data/{multiplayer => }/eras.cfg (94%)
 rename data/{multiplayer => }/eras.lua (100%)

diff --git a/data/_main.cfg b/data/_main.cfg
index 5df8f98c249..a6a4d9add85 100644
--- a/data/_main.cfg
+++ b/data/_main.cfg
@@ -30,11 +30,11 @@
 {test/multiplayer/}
 #endif
 
-#else
-# using different default eras in sp and mp forcesus to a config reload which we dont want.
-{multiplayer/eras.cfg}
 #endif
 
+# Using different default eras in SP and MP forces a config reload which we don't want.
+{eras.cfg}
+
 {campaigns/}
 
 [ais]
diff --git a/data/multiplayer/eras.cfg b/data/eras.cfg
similarity index 94%
rename from data/multiplayer/eras.cfg
rename to data/eras.cfg
index bf5aa55b7d5..36a27d40ffe 100644
--- a/data/multiplayer/eras.cfg
+++ b/data/eras.cfg
@@ -16,7 +16,7 @@
     [event]
         name=prestart
         [lua]
-            code = << wesnoth.require("multiplayer/eras.lua").quick_4mp_leaders(...) >>
+            code = << wesnoth.require("eras.lua").quick_4mp_leaders(...) >>
             [args]
                 {TRAIT_QUICK}
             [/args]
@@ -28,7 +28,7 @@
     [event]
         name=time over
         [lua]
-            code = << wesnoth.require("multiplayer/eras.lua").turns_over_advantage() >>
+            code = << wesnoth.require("eras.lua").turns_over_advantage() >>
         [/lua]
     [/event]
 #enddef
diff --git a/data/multiplayer/eras.lua b/data/eras.lua
similarity index 100%
rename from data/multiplayer/eras.lua
rename to data/eras.lua
diff --git a/data/multiplayer/_main.cfg b/data/multiplayer/_main.cfg
index 518c37fe1b7..252c1d7f269 100644
--- a/data/multiplayer/_main.cfg
+++ b/data/multiplayer/_main.cfg
@@ -14,8 +14,6 @@
 
 {multiplayer/scenarios/}
 
-{multiplayer/eras.cfg}
-
 [lobby_music]
     {DEFAULT_MUSIC_PLAYLIST}
     [music]