mail[Wesnoth-commits] r43556 - in /trunk/data/core/terrain-graphics: internal-complex.cfg transitions.cfg


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

Header


Content

Posted by jeremy . rosen on June 18, 2010 - 17:42:
Author: boucman
Date: Fri Jun 18 17:42:09 2010
New Revision: 43556

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43556&view=rev
Log:
fix some macro errors detected by wmlscope

Modified:
    trunk/data/core/terrain-graphics/internal-complex.cfg
    trunk/data/core/terrain-graphics/transitions.cfg

Modified: trunk/data/core/terrain-graphics/internal-complex.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/internal-complex.cfg?rev=43556&r1=43555&r2=43556&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/internal-complex.cfg (original)
+++ trunk/data/core/terrain-graphics/internal-complex.cfg Fri Jun 18 17:42:09 
2010
@@ -87,22 +87,6 @@
 # take one of the images IMAGESTEM#
 # the chances are the same for all available images, even if the last ones 
are missing
 
-
-#define BORDER_SINGLE_RANDOM_LFB TERRAIN LAYER FLAG BUILDER IMAGESTEM
-    {BORDER_SINGLE_PLFB ({TERRAIN})  9  {LAYER} {FLAG} {BUILDER} 
{IMAGESTEM}11}
-    {BORDER_SINGLE_PLFB ({TERRAIN}) 10  {LAYER} {FLAG} {BUILDER} 
{IMAGESTEM}10}
-    {BORDER_SINGLE_PLFB ({TERRAIN}) 11  {LAYER} {FLAG} {BUILDER} 
{IMAGESTEM}9 }
-    {BORDER_SINGLE_PLFB ({TERRAIN}) 12  {LAYER} {FLAG} {BUILDER} 
{IMAGESTEM}8 }
-    {BORDER_SINGLE_PLFB ({TERRAIN}) 14  {LAYER} {FLAG} {BUILDER} 
{IMAGESTEM}7 }
-    {BORDER_SINGLE_PLFB ({TERRAIN}) 16  {LAYER} {FLAG} {BUILDER} 
{IMAGESTEM}6 }
-    {BORDER_SINGLE_PLFB ({TERRAIN}) 20  {LAYER} {FLAG} {BUILDER} 
{IMAGESTEM}5 }
-    {BORDER_SINGLE_PLFB ({TERRAIN}) 25  {LAYER} {FLAG} {BUILDER} 
{IMAGESTEM}4 }
-    {BORDER_SINGLE_PLFB ({TERRAIN}) 33  {LAYER} {FLAG} {BUILDER} 
{IMAGESTEM}3 }
-    {BORDER_SINGLE_PLFB ({TERRAIN}) 50  {LAYER} {FLAG} {BUILDER} 
{IMAGESTEM}2 }
-    {BORDER_SINGLE_PLFB ({TERRAIN}) 100 {LAYER} {FLAG} {BUILDER} {IMAGESTEM} 
 }
-#enddef
-
-
 #define BORDER_RESTRICTED_RANDOM_LFB TERRAIN ADJACENT LAYER FLAG BUILDER 
IMAGESTEM
     {BORDER_RESTRICTED_PLFB ({TERRAIN}) ({ADJACENT})  9  {LAYER} {FLAG} 
{BUILDER} {IMAGESTEM}11}
     {BORDER_RESTRICTED_PLFB ({TERRAIN}) ({ADJACENT}) 10  {LAYER} {FLAG} 
{BUILDER} {IMAGESTEM}10}

Modified: trunk/data/core/terrain-graphics/transitions.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/transitions.cfg?rev=43556&r1=43555&r2=43556&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/transitions.cfg (original)
+++ trunk/data/core/terrain-graphics/transitions.cfg Fri Jun 18 17:42:09 2010
@@ -23,22 +23,6 @@
 
 
 ###############################
-#  No test on neighbour       #
-###############################
-#define TRANSITION_PLFB TERRAIN PROB LAYER FLAG BUILDER IMAGESTEM
-{BORDER_SINGLE_PLFB ({TERRAIN})  ({PROB}) ({LAYER}) ({FLAG}) ({BUILDER}) 
({IMAGESTEM})}
-#enddef
-
-#meta-macro TERRAIN_BASE TERRAINLIST P=PROB=100 L=LAYER=-500 
F=FLAG=transition B=BUILDER=IMAGE_SINGLE IMAGESTEM
-
-
-#define TRANSITION_RANDOM_LFB TERRAIN LAYER FLAG BUILDER IMAGESTEM
-{BORDER_SINGLE_RANDOM_LFB ({TERRAIN}) ({LAYER}) ({FLAG}) ({BUILDER}) 
({IMAGESTEM})}
-#enddef
-
-#meta-macro TERRAIN_BASE_RANDOM TERRAINLIST L=LAYER=-500 F=FLAG=transition 
B=BUILDER=IMAGE_SINGLE IMAGESTEM
-
-###############################
 #  Needs one neighbour        #
 ###############################
 
@@ -102,80 +86,6 @@
 ###############        AUTO GENERATED CODE        
###################################################
 
#####################################################################################################
 #The following code is autogenerated by expand-terrain-macros.py
-#generated from: #meta-macro TERRAIN_BASE TERRAINLIST P=PROB=100 
L=LAYER=-500 F=FLAG=transition B=BUILDER=IMAGE_SINGLE IMAGESTEM
-#Please do not modify
-#define TERRAIN_BASE_LFB TERRAINLIST LAYER FLAG BUILDER IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) 100 ({LAYER}) ({FLAG}) ({BUILDER}) 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_PFB TERRAINLIST PROB FLAG BUILDER IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) ({PROB}) -500 ({FLAG}) ({BUILDER}) 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_FB TERRAINLIST FLAG BUILDER IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) 100 -500 ({FLAG}) ({BUILDER}) 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_PLB TERRAINLIST PROB LAYER BUILDER IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) ({PROB}) ({LAYER}) transition 
({BUILDER}) ({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_LB TERRAINLIST LAYER BUILDER IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) 100 ({LAYER}) transition ({BUILDER}) 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_PB TERRAINLIST PROB BUILDER IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) ({PROB}) -500 transition ({BUILDER}) 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_B TERRAINLIST BUILDER IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) 100 -500 transition ({BUILDER}) 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_PLF TERRAINLIST PROB LAYER FLAG IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) ({PROB}) ({LAYER}) ({FLAG}) 
IMAGE_SINGLE ({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_LF TERRAINLIST LAYER FLAG IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) 100 ({LAYER}) ({FLAG}) IMAGE_SINGLE 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_PF TERRAINLIST PROB FLAG IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) ({PROB}) -500 ({FLAG}) IMAGE_SINGLE 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_F TERRAINLIST FLAG IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) 100 -500 ({FLAG}) IMAGE_SINGLE 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_PL TERRAINLIST PROB LAYER IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) ({PROB}) ({LAYER}) transition 
IMAGE_SINGLE ({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_L TERRAINLIST LAYER IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) 100 ({LAYER}) transition IMAGE_SINGLE 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_P TERRAINLIST PROB IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) ({PROB}) -500 transition IMAGE_SINGLE 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE TERRAINLIST IMAGESTEM
-    {TERRAIN_BASE_PLFB ({TERRAINLIST}) 100 -500 transition IMAGE_SINGLE 
({IMAGESTEM})}
-#enddef
-#end of generated code
-#The following code is autogenerated by expand-terrain-macros.py
-#generated from: #meta-macro TERRAIN_BASE_RANDOM TERRAINLIST L=LAYER=-500 
F=FLAG=transition B=BUILDER=IMAGE_SINGLE IMAGESTEM
-#Please do not modify
-#define TERRAIN_BASE_RANDOM_FB TERRAINLIST FLAG BUILDER IMAGESTEM
-    {TERRAIN_BASE_RANDOM_LFB ({TERRAINLIST}) -500 ({FLAG}) ({BUILDER}) 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_RANDOM_LB TERRAINLIST LAYER BUILDER IMAGESTEM
-    {TERRAIN_BASE_RANDOM_LFB ({TERRAINLIST}) ({LAYER}) transition 
({BUILDER}) ({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_RANDOM_B TERRAINLIST BUILDER IMAGESTEM
-    {TERRAIN_BASE_RANDOM_LFB ({TERRAINLIST}) -500 transition ({BUILDER}) 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_RANDOM_LF TERRAINLIST LAYER FLAG IMAGESTEM
-    {TERRAIN_BASE_RANDOM_LFB ({TERRAINLIST}) ({LAYER}) ({FLAG}) IMAGE_SINGLE 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_RANDOM_F TERRAINLIST FLAG IMAGESTEM
-    {TERRAIN_BASE_RANDOM_LFB ({TERRAINLIST}) -500 ({FLAG}) IMAGE_SINGLE 
({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_RANDOM_L TERRAINLIST LAYER IMAGESTEM
-    {TERRAIN_BASE_RANDOM_LFB ({TERRAINLIST}) ({LAYER}) transition 
IMAGE_SINGLE ({IMAGESTEM})}
-#enddef
-#define TERRAIN_BASE_RANDOM TERRAINLIST IMAGESTEM
-    {TERRAIN_BASE_RANDOM_LFB ({TERRAINLIST}) -500 transition IMAGE_SINGLE 
({IMAGESTEM})}
-#enddef
-#end of generated code
-#The following code is autogenerated by expand-terrain-macros.py
 #generated from: #meta-macro TRANSITION_RESTRICTED TERRAIN ADJACENT 
P=PROB=100 L=LAYER=-500 F=FLAG=transition B=BUILDER=IMAGE_SINGLE IMAGESTEM
 #Please do not modify
 #define TRANSITION_RESTRICTED_LFB TERRAIN ADJACENT LAYER FLAG BUILDER 
IMAGESTEM




Related Messages


Powered by MHonArc, Updated Fri Jun 18 18:00:14 2010