From 9ec71d467a6db831aa2f5970b5db4f3507e3ec9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20=C5=9Aniatowski?= <kailoran@gmail.com>
Date: Tue, 12 Aug 2008 19:28:39 +0100
Subject: [PATCH] editor2: set the EDITOR wml symbol so UMC can continue to use
 it.

Work around how the old editor used the EDITOR symbol
---
 data/_main.cfg                                  | 16 +++++++++++++++-
 data/campaigns/Descent_Into_Darkness/_main.cfg  | 10 +---------
 data/campaigns/Under_the_Burning_Suns/_main.cfg | 10 +---------
 data/core/_main.cfg                             |  2 +-
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/data/_main.cfg b/data/_main.cfg
index 2c97f66d1ae..9ce1c699dc8 100644
--- a/data/_main.cfg
+++ b/data/_main.cfg
@@ -1,4 +1,15 @@
 #textdomain wesnoth
+
+#ifdef EDITOR
+#define OLD_EDITOR
+#enddef
+#else
+#ifdef EDITOR2
+#define EDITOR
+#enddef
+#endif
+#endif
+
 {themes/}
 
 {core/}
@@ -7,7 +18,7 @@
     {multiplayer/}
 #endif
 
-#ifdef EDITOR
+#ifdef OLD_EDITOR
     [textdomain]
         name="wesnoth-editor"
     [/textdomain]
@@ -27,6 +38,9 @@
 	{multiplayer/scenarios/Random_Scenario.cfg}
 #endif
     {campaigns/}
+#ifdef EDITOR2
+	{~campaigns/}
+#endif
     {scenario-test.cfg}
     {scenario-formula.cfg}
     {scenario-formula-recruitment.cfg}
diff --git a/data/campaigns/Descent_Into_Darkness/_main.cfg b/data/campaigns/Descent_Into_Darkness/_main.cfg
index 9e7717018d8..cdeec5f0c0e 100644
--- a/data/campaigns/Descent_Into_Darkness/_main.cfg
+++ b/data/campaigns/Descent_Into_Darkness/_main.cfg
@@ -52,7 +52,7 @@
 
 #endif
 
-#define EDITOR_TERRAIN_DEF_DiD
+#ifdef EDITOR
 [binary_path]
     path=data/campaigns/Descent_Into_Darkness
 [/binary_path]
@@ -62,14 +62,6 @@
     icon="group_custom"
 [/editor_group]
 {campaigns/Descent_Into_Darkness/utils/terrain.cfg}
-#enddef
-
-#ifdef EDITOR
-{EDITOR_TERRAIN_DEF_DiD}
-#else
-#ifdef EDITOR2
-{EDITOR_TERRAIN_DEF_DiD}
-#endif
 #endif
 
 #undef EDITOR_TERRAIN_DEF_DiD
\ No newline at end of file
diff --git a/data/campaigns/Under_the_Burning_Suns/_main.cfg b/data/campaigns/Under_the_Burning_Suns/_main.cfg
index bc18698d0cc..169440ae68a 100644
--- a/data/campaigns/Under_the_Burning_Suns/_main.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/_main.cfg
@@ -122,7 +122,7 @@
 
 #endif
 
-#define EDITOR_TERRAIN_DEF_UtBS
+#ifdef EDITOR
 [binary_path]
     path=data/campaigns/Under_the_Burning_Suns
 [/binary_path]
@@ -133,14 +133,6 @@
 [/editor_group]
 {campaigns/Under_the_Burning_Suns/utils/terrain.cfg}
 {campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg}
-#enddef
-
-#ifdef EDITOR
-{EDITOR_TERRAIN_DEF_UtBS}
-#else
-#ifdef EDITOR2
-{EDITOR_TERRAIN_DEF_UtBS}
-#endif
 #endif
 
 #undef EDITOR_TERRAIN_DEF_UtBS
diff --git a/data/core/_main.cfg b/data/core/_main.cfg
index db566ca398c..3c11d206e48 100644
--- a/data/core/_main.cfg
+++ b/data/core/_main.cfg
@@ -3,7 +3,7 @@
 
 # wmlscope: set export=yes
 
-#ifdef EDITOR
+#ifdef OLD_EDITOR
 {core/macros/}
 {core/terrain.cfg}
 {core/terrain-graphics/}