Author: esr
Date: Sun Sep 12 23:03:54 2010
New Revision: 46426
URL: http://svn.gna.org/viewcvs/wesnoth?rev=46426&view=rev
Log:
wmlscope/wmllint cleanup. Mainline is clean.
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
trunk/data/core/macros/terrain-utils.cfg
trunk/data/core/terrain-graphics/mountains.cfg
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg?rev=46426&r1=46425&r2=46426&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg Sun
Sep 12 23:03:54 2010
@@ -300,8 +300,9 @@
x=25
y=32
[/unit]
+ # wmlscope: start ignoring
{UNIT 1 (Elvish Marksman) recall recall ()}
-
+ # wmlscope: stop ignoring
[/then]
[/if]
[if]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg?rev=46426&r1=46425&r2=46426&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
Sun Sep 12 23:03:54 2010
@@ -388,4 +388,4 @@
[/scenario]
#else
[/multiplayer]
-#endif
+#endif
Modified: trunk/data/core/macros/terrain-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/terrain-utils.cfg?rev=46426&r1=46425&r2=46426&view=diff
==============================================================================
--- trunk/data/core/macros/terrain-utils.cfg (original)
+++ trunk/data/core/macros/terrain-utils.cfg Sun Sep 12 23:03:54 2010
@@ -70,14 +70,14 @@
{CLEAR_VARIABLE random_placement_locations}
#enddef
-#define SCATTER_EMBELLISHMENTS TERRAIN_PATTERN EMBELLISHMENT_NAME PERCENTAGE
+#define SCATTER_EMBELLISHMENTS TERRAINLIST EMBELLISHMENT_NAME PERCENTAGE
# Adds the given embellishment to the given percentage of the given terrain
# on the map.
#
# For example, this will add flowers to 5% of all grassland:
#! {SCATTER_EMBELLISHMENTS G* ^Efm 5}
[store_locations]
- terrain={TERRAIN_PATTERN}
+ terrain={TERRAINLIST}
variable=terrain_variation_locations
[/store_locations]
Modified: trunk/data/core/terrain-graphics/mountains.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/mountains.cfg?rev=46426&r1=46425&r2=46426&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/mountains.cfg (original)
+++ trunk/data/core/terrain-graphics/mountains.cfg Sun Sep 12 23:03:54 2010
@@ -295,7 +295,7 @@
[/terrain_graphics]
#enddef
-#define VOLCANO_2x2 TERRAIN SURROUNDING_TERRAIN PROB FLAG IMAGESTEM
+#define VOLCANO_2x2 TERRAIN SURROUNDING_TERRAINLIST PROB FLAG IMAGESTEM
[terrain_graphics]
map="
., *, ., .
@@ -315,7 +315,7 @@
[tile]
pos=2
- type={SURROUNDING_TERRAIN}
+ type={SURROUNDING_TERRAINLIST}
set_no_flag={FLAG}
[/tile]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
