Author: ilor
Date: Tue Aug 12 20:28:39 2008
New Revision: 28499
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28499&view=rev
Log:
editor2: set the EDITOR wml symbol so UMC can continue to use it. Work around
how the old editor used the EDITOR symbol
Modified:
trunk/data/_main.cfg
trunk/data/campaigns/Descent_Into_Darkness/_main.cfg
trunk/data/campaigns/Under_the_Burning_Suns/_main.cfg
trunk/data/core/_main.cfg
Modified: trunk/data/_main.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/_main.cfg?rev=28499&r1=28498&r2=28499&view=diff
==============================================================================
--- trunk/data/_main.cfg (original)
+++ trunk/data/_main.cfg Tue Aug 12 20:28:39 2008
@@ -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}
Modified: trunk/data/campaigns/Descent_Into_Darkness/_main.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/_main.cfg?rev=28499&r1=28498&r2=28499&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/_main.cfg (original)
+++ trunk/data/campaigns/Descent_Into_Darkness/_main.cfg Tue Aug 12 20:28:39
2008
@@ -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
Modified: trunk/data/campaigns/Under_the_Burning_Suns/_main.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/_main.cfg?rev=28499&r1=28498&r2=28499&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/_main.cfg (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/_main.cfg Tue Aug 12 20:28:39
2008
@@ -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
Modified: trunk/data/core/_main.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/_main.cfg?rev=28499&r1=28498&r2=28499&view=diff
==============================================================================
--- trunk/data/core/_main.cfg (original)
+++ trunk/data/core/_main.cfg Tue Aug 12 20:28:39 2008
@@ -3,7 +3,7 @@
# wmlscope: set export=yes
-#ifdef EDITOR
+#ifdef OLD_EDITOR
{core/macros/}
{core/terrain.cfg}
{core/terrain-graphics/}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
