Author: esr
Date: Mon Oct 20 13:25:36 2008
New Revision: 30281
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30281&view=rev
Log:
wmllint missed a case in converting the track-marking macros.
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_Of_Barag_Gor.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg
trunk/data/core/editor-groups.cfg
trunk/data/tools/wmllint
Modified: trunk/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg (original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg Mon Oct 20
13:25:36 2008
@@ -52,7 +52,7 @@
{NEW_JOURNEY 295 320}
{NEW_JOURNEY 317 333}
{NEW_JOURNEY 343 344}
- {CROSS 358 337}
+ {NEW_BATTLE 363 342}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg Mon
Oct 20 13:25:36 2008
@@ -138,7 +138,7 @@
{NEW_JOURNEY 550 345}
{NEW_JOURNEY 537 331}
{NEW_JOURNEY 523 315}
- {CROSS 496 294}
+ {NEW_BATTLE 501 299}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
Mon Oct 20 13:25:36 2008
@@ -81,7 +81,7 @@
[part]
background=sotbe1.png
show_title=yes
- {CROSS 496 294}
+ {NEW_BATTLE 501 299}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
---
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
(original)
+++
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
Mon Oct 20 13:25:36 2008
@@ -112,7 +112,7 @@
{NEW_JOURNEY 453 192}
{NEW_JOURNEY 431 202}
{NEW_JOURNEY 404 213}
- {CROSS 374 221}
+ {NEW_BATTLE 379 226}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_Of_Barag_Gor.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_Of_Barag_Gor.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
---
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_Of_Barag_Gor.cfg
(original)
+++
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_Of_Barag_Gor.cfg
Mon Oct 20 13:25:36 2008
@@ -239,7 +239,7 @@
{NEW_JOURNEY 309 220}
{NEW_JOURNEY 276 214}
{NEW_JOURNEY 246 217}
- {CROSS 212 213}
+ {NEW_BATTLE 217 218}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
---
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
(original)
+++
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
Mon Oct 20 13:25:36 2008
@@ -222,7 +222,7 @@
{NEW_JOURNEY 221 98}
{NEW_JOURNEY 220 115}
{NEW_JOURNEY 219 138}
- {CROSS 217 156}
+ {NEW_BATTLE 222 161}
[/part]
[/story]
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg Mon
Oct 20 13:25:36 2008
@@ -152,7 +152,7 @@
{NEW_JOURNEY 240 277}
{NEW_JOURNEY 232 297}
{NEW_JOURNEY 220 319}
- {CROSS 204 333}
+ {NEW_BATTLE 209 338}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
Mon Oct 20 13:25:36 2008
@@ -128,7 +128,7 @@
{NEW_JOURNEY 294 290}
{NEW_JOURNEY 314 289}
{NEW_JOURNEY 340 296}
- {CROSS 356 293}
+ {NEW_BATTLE 361 298}
[/part]
[/story]
[event]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg
Mon Oct 20 13:25:36 2008
@@ -135,7 +135,7 @@
{NEW_JOURNEY 221 166}
{NEW_JOURNEY 242 158}
{NEW_JOURNEY 258 150}
- {CROSS 277 143}
+ {NEW_BATTLE 282 148}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
---
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
(original)
+++
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
Mon Oct 20 13:25:36 2008
@@ -86,7 +86,7 @@
{NEW_JOURNEY 415 199}
{NEW_JOURNEY 434 193}
{NEW_JOURNEY 457 185}
- {CROSS 463 171}
+ {NEW_BATTLE 468 176}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
Mon Oct 20 13:25:36 2008
@@ -130,7 +130,7 @@
{NEW_JOURNEY 349 319}
{NEW_JOURNEY 324 329}
{NEW_JOURNEY 323 355}
- {CROSS 318 378}
+ {NEW_BATTLE 323 383}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
Mon Oct 20 13:25:36 2008
@@ -160,7 +160,7 @@
[part]
background=sotbe3.png
show_title=yes
- {CROSS 318 378}
+ {NEW_BATTLE 323 383}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
Mon Oct 20 13:25:36 2008
@@ -153,7 +153,7 @@
{NEW_JOURNEY 408 403}
{NEW_JOURNEY 434 397}
{NEW_JOURNEY 460 401}
- {CROSS 474 410}
+ {NEW_BATTLE 479 415}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
Mon Oct 20 13:25:36 2008
@@ -148,7 +148,7 @@
{NEW_JOURNEY 366 244}
{NEW_JOURNEY 390 234}
{NEW_JOURNEY 415 235}
- {CROSS 428 218}
+ {NEW_BATTLE 433 223}
[/part]
[/story]
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg Mon
Oct 20 13:25:36 2008
@@ -151,7 +151,7 @@
show_title=yes
{NEW_JOURNEY 433 223}
{NEW_JOURNEY 452 217}
- {CROSS 460 200}
+ {NEW_BATTLE 465 205}
[/part]
[/story]
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg Mon
Oct 20 13:25:36 2008
@@ -177,7 +177,7 @@
{NEW_JOURNEY 375 284}
{NEW_JOURNEY 349 307}
{NEW_JOURNEY 327 328}
- {CROSS 302 343}
+ {NEW_BATTLE 307 348}
[/part]
[/story]
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg (original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg Mon Oct
20 13:25:36 2008
@@ -153,7 +153,7 @@
{NEW_JOURNEY 256 377}
{NEW_JOURNEY 241 400}
{NEW_JOURNEY 235 426}
- {CROSS 218 440}
+ {NEW_BATTLE 223 445}
[/part]
[/story]
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg Mon
Oct 20 13:25:36 2008
@@ -140,7 +140,7 @@
{NEW_JOURNEY 355 415}
{NEW_JOURNEY 397 423}
{NEW_JOURNEY 444 428}
- {CROSS 473 419}
+ {NEW_BATTLE 478 424}
[/part]
[/story]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
---
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
(original)
+++
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
Mon Oct 20 13:25:36 2008
@@ -167,7 +167,7 @@
[part]
background=sotbe3.png
show_title=yes
- {CROSS 490 430}
+ {NEW_BATTLE 495 435}
[/part]
[/story]
Modified: trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg (original)
+++ trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg Mon Oct 20 13:25:36
2008
@@ -46,7 +46,7 @@
{NEW_JOURNEY 230 90}
{NEW_JOURNEY 219 104}
{NEW_JOURNEY 205 114}
- {CROSS 187 117}
+ {NEW_BATTLE 192 122}
[/part]
[/story]
#enddef
@@ -76,7 +76,7 @@
{NEW_JOURNEY 147 155}
{NEW_JOURNEY 132 164}
{NEW_JOURNEY 117 173}
- {CROSS 99 183}
+ {NEW_BATTLE 104 188}
[/part]
[/story]
#enddef
Modified: trunk/data/core/editor-groups.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/editor-groups.cfg?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/core/editor-groups.cfg (original)
+++ trunk/data/core/editor-groups.cfg Mon Oct 20 13:25:36 2008
@@ -76,4 +76,4 @@
id=special
name= _ "special"
icon="group_x"
-[/editor_group]
+[/editor_group]
Modified: trunk/data/tools/wmllint
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmllint?rev=30281&r1=30280&r2=30281&view=diff
==============================================================================
--- trunk/data/tools/wmllint (original)
+++ trunk/data/tools/wmllint Mon Oct 20 13:25:36 2008
@@ -770,7 +770,7 @@
lines[i] = lines[i].replace("FLAG_RED_CENTERED", "NEW_REST")
elif "{FLAG_WHITE_CENTERED" in lines[i]:
lines[i] = lines[i].replace("FLAG_WHITE_CENTERED", "OLD_REST")
- elif "{DOT " in lines[i]:
+ elif "{DOT " in lines[i] or "CROSS" in lines[i]:
m = re.search("{(DOT|CROSS) ([0-9]+) ([0-9]+)}", lines[i])
if m:
n = m.group(1)
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
