mail[Wesnoth-commits] r24356 - in /branches/1.4/data: campaigns/Liberty/scenarios/ campaigns/Son_Of_The_Black_Eye/scenarios/ tools/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 06, 2008 - 12:28:
Author: esr
Date: Thu Mar  6 12:03:04 2008
New Revision: 24356

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24356&view=rev
Log:
Backport fixes for bugs #11202, #11208.

Modified:
    branches/1.4/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
    
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
    branches/1.4/data/tools/wmllint

Modified: branches/1.4/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg?rev=24356&r1=24355&r2=24356&view=diff
==============================================================================
--- branches/1.4/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg 
(original)
+++ branches/1.4/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg Thu Mar  
6 12:03:04 2008
@@ -125,8 +125,8 @@
         [recall]
             description=Harper
         [/recall]
-        {LOYAL_UNIT 1 Outlaw Jingo ( _ "Jingo") 30 17} 
-        {LOYAL_UNIT 1 Outlaw Majel ( _ "Majel") 32 17}
+        {LOYAL_UNIT 1 Outlaw 30 17 Jingo ( _ "Jingo")} 
+        {LOYAL_UNIT 1 Outlaw 32 17 Majel ( _ "Majel")}
         # wmllint: recognize Jingo
         # wmllint: recognize Majel
     [/event]
@@ -155,7 +155,7 @@
             message= _ "The garrison. The towers of Halstead are more than a 
garrison, nephew, they are a fortress. They used to protect this area from 
the enemies of Wesnoth; I never imagined they would house the enemies of 
Wesnoth."
         [/message]
 
-        {LOYAL_UNIT 1 Dragoon Pitcher ( _ "Pitcher") 11 1} 
+        {LOYAL_UNIT 1 Dragoon 11 1 (Pitcher) ( _ "Pitcher")} 
         # wmllint: recognize Pitcher
 
         {MOVE_UNIT description=Pitcher 20 14}

Modified: 
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg?rev=24356&r1=24355&r2=24356&view=diff
==============================================================================
--- 
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
 (original)
+++ 
branches/1.4/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
 Thu Mar  6 12:03:04 2008
@@ -9,7 +9,6 @@
 
     next_scenario="Saving_Inarix"
     {SCENARIO_MUSIC "northerners.ogg"}
-    {VICTORY_AND_DEFEAT_MUSIC}
 
     [event]
         name=prestart
@@ -147,7 +146,7 @@
         name=time over
         {OLD_ORCISH_SHAMAN 32 30 Fabstep _"Fabstep"}
         {OLD_ORCISH_SHAMAN 32 30 Klebar _"Klebar"}
-        {OLD_ORCISH_SHAMAN 32 30 Echarp _"Echarp""}
+        {OLD_ORCISH_SHAMAN 32 30 Echarp _"Echarp"}
         # wmllint: recognize Fabstep
         # wmllint: recognize Klebar
         # wmllint: recognize Echarp

Modified: branches/1.4/data/tools/wmllint
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/tools/wmllint?rev=24356&r1=24355&r2=24356&view=diff
==============================================================================
--- branches/1.4/data/tools/wmllint (original)
+++ branches/1.4/data/tools/wmllint Thu Mar  6 12:03:04 2008
@@ -271,8 +271,8 @@
     "1.3.4" : (
        # This release changed from numeric to string palette IDs
         ("RC(magenta>1)", "RC(magenta>red)"),
-        ("RC(magenta>2)", "RC(magenta>green)"),
-        ("RC(magenta>3)", "RC(magenta>blue)"),
+        ("RC(magenta>2)", "RC(magenta>blue)"),
+        ("RC(magenta>3)", "RC(magenta>green)"),
         ("RC(magenta>4)", "RC(magenta>purple)"),
         ("RC(magenta>5)", "RC(magenta>black)"),
         ("RC(magenta>6)", "RC(magenta>brown)"),
@@ -280,8 +280,8 @@
         ("RC(magenta>8)", "RC(magenta>white)"),
         ("RC(magenta>9)", "RC(magenta>teal)"),
         ("colour=1", "colour=red"),
-        ("colour=2", "colour=green"),
-        ("colour=3", "colour=blue"),
+        ("colour=2", "colour=blue"),
+        ("colour=3", "colour=green"),
         ("colour=4", "colour=purple"),
         ("colour=5", "colour=black"),
         ("colour=6", "colour=brown"),
@@ -1825,18 +1825,24 @@
     # Simple check for unbalanced macro calls
     unclosed = None
     linecount = 1
-    depth = 0
+    startline = None
+    depth = quotecount = 0
     for i in range(len(transformed)):
         if transformed[i] == '\n':
             linecount += 1
         elif transformed[i] == '{':
             if depth == 0:
-                unclosed = linecount
+                unclosed = startline = linecount
+                quotecount = 0
             depth += 1
+        elif transformed[i] == '"':
+            quotecount += 1
         elif transformed[i] == '}':
             depth -= 1
             if depth == 0:
                 unclosed = None
+                if quotecount % 2:
+                    print >>sys.stderr, '"%s", line %d: unbalanced quote.' % 
(filename, startline)
     if unclosed:
         print >>sys.stderr, '"%s", line %d: unbalanced {.' % (filename, 
unclosed)
     # Return None if the transformation functions made no changes.




Related Messages


Powered by MHonArc, Updated Thu Mar 06 13:40:54 2008