mail[Wesnoth-commits] r44059 - in /trunk/data/core/terrain-graphics: base.cfg internal-complex-tracks.cfg keep.cfg transitions.cfg village.cfg


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

Header


Content

Posted by jeremy . rosen on July 10, 2010 - 00:01:
Author: boucman
Date: Sat Jul 10 00:01:04 2010
New Revision: 44059

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44059&view=rev
Log:
fix various problems detected by wmlscope

Modified:
    trunk/data/core/terrain-graphics/base.cfg
    trunk/data/core/terrain-graphics/internal-complex-tracks.cfg
    trunk/data/core/terrain-graphics/keep.cfg
    trunk/data/core/terrain-graphics/transitions.cfg
    trunk/data/core/terrain-graphics/village.cfg

Modified: trunk/data/core/terrain-graphics/base.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/base.cfg?rev=44059&r1=44058&r2=44059&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/base.cfg (original)
+++ trunk/data/core/terrain-graphics/base.cfg Sat Jul 10 00:01:04 2010
@@ -51,25 +51,25 @@
 ###############################
 
 #define TERRAIN_BASE_RESTRICTED2_PLFB TERRAINLIST ADJACENT PROB LAYER FLAG 
BUILDER IMAGESTEM
-{GENERIC_RESTRICTED2_PLFB ({TERRAINLIST}) ({ADJACENT}) ({ADJACENT}) ({PROB}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) ()}
+{GENERIC_RESTRICTED2_PLFB ({TERRAINLIST}) ({ADJACENT}) ({PROB}) ({LAYER}) 
({FLAG}) ({BUILDER}) ({IMAGESTEM}) ()}
 #enddef
 
 #meta-macro TERRAIN_BASE_RESTRICTED2 TERRAINLIST ADJACENT P=PROB=100 
L=LAYER=-1000 F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
 #define TERRAIN_BASE_RESTRICTED2_RANDOM_LFB TERRAINLIST ADJACENT LAYER FLAG 
BUILDER IMAGESTEM
-{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAINLIST}) ({ADJACENT}) ({ADJACENT}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) ()}
+{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAINLIST}) ({ADJACENT}) ({LAYER}) 
({FLAG}) ({BUILDER}) ({IMAGESTEM}) ()}
 #enddef
 
 #meta-macro TERRAIN_BASE_RESTRICTED2_RANDOM TERRAINLIST ADJACENT 
L=LAYER=-1000 F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
 #define TERRAIN_BASE_ROTATION_RESTRICTED2_PLFB TERRAINLIST ADJACENT PROB 
LAYER FLAG BUILDER IMAGESTEM
-{GENERIC_RESTRICTED2_PLFB ({TERRAINLIST}) ({ADJACENT}) ({ADJACENT}) ({PROB}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
+{GENERIC_RESTRICTED2_PLFB ({TERRAINLIST}) ({ADJACENT}) ({PROB}) ({LAYER}) 
({FLAG}) ({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
 #enddef
 
 #meta-macro TERRAIN_BASE_ROTATION_RESTRICTED2 TERRAINLIST  ADJACENT 
P=PROB=100 L=LAYER=-1000 F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
 #define TERRAIN_BASE_ROTATION_RESTRICTED2_RANDOM_LFB TERRAINLIST ADJACENT 
LAYER FLAG BUILDER IMAGESTEM
-{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAINLIST}) ({ADJACENT}) ({ADJACENT}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
+{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAINLIST}) ({ADJACENT}) ({LAYER}) 
({FLAG}) ({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
 #enddef
 
 #meta-macro TERRAIN_BASE_ROTATION_RESTRICTED2_RANDOM TERRAINLIST ADJACENT 
L=LAYER=-1000 F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM

Modified: trunk/data/core/terrain-graphics/internal-complex-tracks.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/internal-complex-tracks.cfg?rev=44059&r1=44058&r2=44059&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/internal-complex-tracks.cfg (original)
+++ trunk/data/core/terrain-graphics/internal-complex-tracks.cfg Sat Jul 10 
00:01:04 2010
@@ -28,33 +28,7 @@
     {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 100 {LAYER} {FLAG} 
{IMAGESTEM}   {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} 
{S5}}
 #enddef
 
-#define TRACK_SWITCH_RANDOM_LF TERRAIN ADJACENT LAYER FLAG IMAGESTEM R0 R1 
R2 S0 S1 S2 S3 S4 S5 
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT})  9  {LAYER} {FLAG} 
{IMAGESTEM}11 {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT}) 10  {LAYER} {FLAG} 
{IMAGESTEM}10 {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT}) 11  {LAYER} {FLAG} 
{IMAGESTEM}9  {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT}) 12  {LAYER} {FLAG} 
{IMAGESTEM}8  {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT}) 14  {LAYER} {FLAG} 
{IMAGESTEM}7  {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT}) 16  {LAYER} {FLAG} 
{IMAGESTEM}6  {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT}) 20  {LAYER} {FLAG} 
{IMAGESTEM}5  {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT}) 25  {LAYER} {FLAG} 
{IMAGESTEM}4  {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT}) 33  {LAYER} {FLAG} 
{IMAGESTEM}3  {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT}) 50  {LAYER} {FLAG} 
{IMAGESTEM}2  {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_SWITCH_PLF ({TERRAIN}) ({ADJACENT}) 100 {LAYER} {FLAG} 
{IMAGESTEM}   {R0} {R1} {R2} {S0} {S1} {S2} {S3} {S4} {S5}}
-#enddef
 
-#define TRACK_END_RANDOM_LF TERRAIN ADJACENT LAYER FLAG IMAGESTEM SUFFIX A1 
A2 A3 A4 A5 A6 S0 S1 S2 S3 S4 S5
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT})  9  {LAYER} {FLAG} {IMAGESTEM}11 
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT}) 10  {LAYER} {FLAG} {IMAGESTEM}10 
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT}) 11  {LAYER} {FLAG} {IMAGESTEM}9  
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT}) 12  {LAYER} {FLAG} {IMAGESTEM}8  
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT}) 14  {LAYER} {FLAG} {IMAGESTEM}7  
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT}) 16  {LAYER} {FLAG} {IMAGESTEM}6  
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT}) 20  {LAYER} {FLAG} {IMAGESTEM}5  
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT}) 25  {LAYER} {FLAG} {IMAGESTEM}4  
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT}) 33  {LAYER} {FLAG} {IMAGESTEM}3  
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT}) 50  {LAYER} {FLAG} {IMAGESTEM}2  
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_END_PLF ({TERRAIN}) ({ADJACENT}) 100 {LAYER} {FLAG} {IMAGESTEM}   
{SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-#enddef
 
 #define TRACK_STRAIGHT_RANDOM_LF TERRAIN LAYER FLAG IMAGESTEM SUFFIX R0 R1 
R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
     {TRACK_STRAIGHT_PLF ({TERRAIN})  9  {LAYER} {FLAG} {IMAGESTEM}11 
{SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }

Modified: trunk/data/core/terrain-graphics/keep.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/keep.cfg?rev=44059&r1=44058&r2=44059&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/keep.cfg (original)
+++ trunk/data/core/terrain-graphics/keep.cfg Sat Jul 10 00:01:04 2010
@@ -52,25 +52,25 @@
 ###############################
 
 #define KEEP_BASE_RESTRICTED2_PLFB TERRAIN ADJACENT PROB LAYER FLAG BUILDER 
IMAGESTEM
-{GENERIC_RESTRICTED2_PLFB ({TERRAIN}) ({ADJACENT}) ({ADJACENT}) ({PROB}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) ()}
+{GENERIC_RESTRICTED2_PLFB ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) 
({FLAG}) ({BUILDER}) ({IMAGESTEM}) ()}
 #enddef
 
 #meta-macro KEEP_BASE_RESTRICTED2 TERRAIN ADJACENT P=PROB=100 L=LAYER=-1 
F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
 #define KEEP_BASE_RESTRICTED2_RANDOM_LFB TERRAIN ADJACENT LAYER FLAG BUILDER 
IMAGESTEM
-{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({ADJACENT}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) ()}
+{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({LAYER}) ({FLAG}) 
({BUILDER}) ({IMAGESTEM}) ()}
 #enddef
 
 #meta-macro KEEP_BASE_RESTRICTED2_RANDOM TERRAIN ADJACENT L=LAYER=-1 
F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
 #define KEEP_BASE_ROTATION_RESTRICTED2_PLFB TERRAIN ADJACENT PROB LAYER FLAG 
BUILDER IMAGESTEM
-{GENERIC_RESTRICTED2_PLFB ({TERRAIN}) ({ADJACENT}) ({ADJACENT}) ({PROB}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
+{GENERIC_RESTRICTED2_PLFB ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) 
({FLAG}) ({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
 #enddef
 
 #meta-macro KEEP_BASE_ROTATION_RESTRICTED2 TERRAIN  ADJACENT P=PROB=100 
L=LAYER=-1 F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
 #define KEEP_BASE_ROTATION_RESTRICTED2_RANDOM_LFB TERRAIN ADJACENT LAYER 
FLAG BUILDER IMAGESTEM
-{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({ADJACENT}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
+{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({LAYER}) ({FLAG}) 
({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
 #enddef
 
 #meta-macro KEEP_BASE_ROTATION_RESTRICTED2_RANDOM TERRAIN ADJACENT 
L=LAYER=-1 F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM

Modified: trunk/data/core/terrain-graphics/transitions.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/transitions.cfg?rev=44059&r1=44058&r2=44059&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/transitions.cfg (original)
+++ trunk/data/core/terrain-graphics/transitions.cfg Sat Jul 10 00:01:04 2010
@@ -43,13 +43,13 @@
 ###############################
 
 #define TRANSITION_RESTRICTED2_PLFB TERRAINLIST ADJACENT PROB LAYER FLAG 
BUILDER IMAGESTEM
-{BORDER_RESTRICTED2_PLFB ({TERRAINLIST}) ({ADJACENT}) ({ADJACENT}) ({PROB}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
+{BORDER_RESTRICTED2_PLFB ({TERRAINLIST}) ({ADJACENT}) ({PROB}) ({LAYER}) 
({FLAG}) ({BUILDER}) ({IMAGESTEM})}
 #enddef
 
 #meta-macro TRANSITION_RESTRICTED2 TERRAINLIST ADJACENT P=PROB=100 
L=LAYER=-500 F=FLAG=transition B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
 #define TRANSITION_RESTRICTED2_RANDOM_LFB TERRAINLIST ADJACENT LAYER FLAG 
BUILDER IMAGESTEM
-{BORDER_RESTRICTED2_RANDOM_LFB ({TERRAINLIST}) ({ADJACENT}) ({ADJACENT}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
+{BORDER_RESTRICTED2_RANDOM_LFB ({TERRAINLIST}) ({ADJACENT}) ({LAYER}) 
({FLAG}) ({BUILDER}) ({IMAGESTEM})}
 #enddef
 
 #meta-macro TRANSITION_RESTRICTED2_RANDOM TERRAINLIST ADJACENT L=LAYER=-500 
F=FLAG=transition B=BUILDER=IMAGE_SINGLE IMAGESTEM

Modified: trunk/data/core/terrain-graphics/village.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/village.cfg?rev=44059&r1=44058&r2=44059&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/village.cfg (original)
+++ trunk/data/core/terrain-graphics/village.cfg Sat Jul 10 00:01:04 2010
@@ -57,19 +57,19 @@
 #meta-macro VILLAGE_RESTRICTED2 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 
F=FLAG=village B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
 #define VILLAGE_RESTRICTED2_RANDOM_LFB TERRAIN ADJACENT LAYER FLAG BUILDER 
IMAGESTEM
-{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({ADJACENT}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) ()}
+{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({LAYER}) ({FLAG}) 
({BUILDER}) ({IMAGESTEM}) ()}
 #enddef
 
 #meta-macro VILLAGE_RESTRICTED2_RANDOM TERRAIN ADJACENT L=LAYER=0 
F=FLAG=village B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
 #define VILLAGE_ROTATION_RESTRICTED2_PLFB TERRAIN ADJACENT PROB LAYER FLAG 
BUILDER IMAGESTEM
-{GENERIC_RESTRICTED2_PLFB ({TERRAIN}) ({ADJACENT}) ({ADJACENT}) ({PROB}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
+{GENERIC_RESTRICTED2_PLFB ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) 
({FLAG}) ({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
 #enddef
 
 #meta-macro VILLAGE_ROTATION_RESTRICTED2 TERRAIN  ADJACENT P=PROB=100 
L=LAYER=0 F=FLAG=village B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
 #define VILLAGE_ROTATION_RESTRICTED2_RANDOM_LFB TERRAIN ADJACENT LAYER FLAG 
BUILDER IMAGESTEM
-{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({ADJACENT}) 
({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
+{GENERIC_RESTRICTED2_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({LAYER}) ({FLAG}) 
({BUILDER}) ({IMAGESTEM}) (-@R0-@R1)}
 #enddef
 
 #meta-macro VILLAGE_ROTATION_RESTRICTED2_RANDOM TERRAIN ADJACENT L=LAYER=0 
F=FLAG=village B=BUILDER=IMAGE_SINGLE IMAGESTEM




Related Messages


Powered by MHonArc, Updated Sat Jul 10 01:20:09 2010