Author: elias
Date: Fri Mar 23 21:40:37 2012
New Revision: 53618

URL: http://svn.gna.org/viewcvs/wesnoth?rev=53618&view=rev
Log:
[wmlunits] Set extra_defines from [campaign] in addition to the campaign define.

Modified:
    trunk/data/tools/unit_tree/wiki_output.py
    trunk/data/tools/wmlunits

Modified: trunk/data/tools/unit_tree/wiki_output.py
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/unit_tree/wiki_output.py?rev=53618&r1=53617&r2=53618&view=diff
==============================================================================
--- trunk/data/tools/unit_tree/wiki_output.py (original)
+++ trunk/data/tools/unit_tree/wiki_output.py Fri Mar 23 21:40:37 2012
@@ -28,6 +28,8 @@
     campaigns = wesnoth.parser.get_all(tag = "campaign")
     for campaign in campaigns:
         define = campaign.get_text_val("define")
+        ed = campaign.get_text_val("extra_defines")
+        if ed: define += "," + ed
         name = campaign.get_text_val("name", translation = 
translated.translate)
         sys.stderr.write("Parsing " + name + "...\n")
         campaign.name = name

Modified: trunk/data/tools/wmlunits
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmlunits?rev=53618&r1=53617&r2=53618&view=diff
==============================================================================
--- trunk/data/tools/wmlunits (original)
+++ trunk/data/tools/wmlunits Fri Mar 23 21:40:37 2012
@@ -108,7 +108,10 @@
 
         for campaign in campaigns:
             cid = campaign.get_text_val("id")
-            append(info, cid, campaign.get_text_val("define"), c = campaign)
+            d = campaign.get_text_val("define")
+            d2 = campaign.get_text_val("extra_defines")
+            if d2: d += "," + d2
+            append(info, cid, d, c = campaign)
 
         return info
 


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to