mail[Wesnoth-commits] r44091 - in /trunk/data/core: ./ terrain-graphics/


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 - 19:42:
Author: boucman
Date: Sat Jul 10 19:42:47 2010
New Revision: 44091

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44091&view=rev
Log:
final cleanups to bridge macros

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

Modified: trunk/data/core/terrain-graphics.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics.cfg?rev=44091&r1=44090&r2=44091&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics.cfg (original)
+++ trunk/data/core/terrain-graphics.cfg Sat Jul 10 19:42:47 2010
@@ -15,7 +15,8 @@
 
 # NOTE the terrain _off^_usr gets its definition from the code since it's
 # themable
- # Wooden bridges (put those on top of everything)
+
+ # Bridges must be on top because they set some flags depending on their 
orientation that might be used by other macros later
  {TRACK               *^Bw\ *^Bw| *^Bw/                   bridge/wood}
  # add transition bridges<->bridges wherever images are missing         
  {TRACK_BORDER_RESTRICTED_RANDOM (*Bw|,*^Bw/,*^Bw\) (*^Bw|,*^Bw/,*^Bw/) 
bridge/wood-end}        

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=44091&r1=44090&r2=44091&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/internal-complex-tracks.cfg (original)
+++ trunk/data/core/terrain-graphics/internal-complex-tracks.cfg Sat Jul 10 
19:42:47 2010
@@ -59,33 +59,6 @@
 {TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 100 {LAYER} {FLAG} 
{IMAGESTEM}  }
 #enddef
 
-#define TRACK_ANGLE_RANDOM_CW_LF TERRAINLIST ADJACENT1 ADJACENT2 LAYER FLAG 
IMAGESTEM
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2}  9  {LAYER} {FLAG} 
{IMAGESTEM}}
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 10  {LAYER} {FLAG} 
{IMAGESTEM}}
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 11  {LAYER} {FLAG} 
{IMAGESTEM}}
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 12  {LAYER} {FLAG} 
{IMAGESTEM}}
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 14  {LAYER} {FLAG} 
{IMAGESTEM}}
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 16  {LAYER} {FLAG} 
{IMAGESTEM}}
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 20  {LAYER} {FLAG} 
{IMAGESTEM}}
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 25  {LAYER} {FLAG} 
{IMAGESTEM}}
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 33  {LAYER} {FLAG} 
{IMAGESTEM}}
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 50  {LAYER} {FLAG} 
{IMAGESTEM}}
-{TRACK_ANGLE_CW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 100 {LAYER} {FLAG} 
{IMAGESTEM}}
-#enddef
-
-#define TRACK_ANGLE_RANDOM_CCW_LF TERRAINLIST ADJACENT1 ADJACENT2 LAYER FLAG 
IMAGESTEM
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2}  9  {LAYER} 
{FLAG} {IMAGESTEM}}
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 10  {LAYER} 
{FLAG} {IMAGESTEM}}
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 11  {LAYER} 
{FLAG} {IMAGESTEM}}
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 12  {LAYER} 
{FLAG} {IMAGESTEM}}
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 14  {LAYER} 
{FLAG} {IMAGESTEM}}
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 16  {LAYER} 
{FLAG} {IMAGESTEM}}
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 20  {LAYER} 
{FLAG} {IMAGESTEM}}
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 25  {LAYER} 
{FLAG} {IMAGESTEM}}
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 33  {LAYER} 
{FLAG} {IMAGESTEM}}
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 50  {LAYER} 
{FLAG} {IMAGESTEM}}
-{TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 100 {LAYER} 
{FLAG} {IMAGESTEM}}
-#enddef
 
 #define TRACK_ALONE_RANDOM_LF TERRAINLIST LAYER FLAG IMAGESTEM SUFFIX R0 R1 
R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
 {TRACK_ALONE_PLF ({TERRAINLIST})  9  {LAYER} {FLAG} {IMAGESTEM}11 {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }

Modified: trunk/data/core/terrain-graphics/internal-tracks.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/internal-tracks.cfg?rev=44091&r1=44090&r2=44091&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/internal-tracks.cfg (original)
+++ trunk/data/core/terrain-graphics/internal-tracks.cfg Sat Jul 10 19:42:47 
2010
@@ -196,65 +196,3 @@
     [/terrain_graphics]
 #enddef
 
-#define TRACK_ANGLE_CW_PLF TERRAINLIST ADJACENT1 ADJACENT2 PROB LAYER FLAG 
IMAGESTEM
-    [terrain_graphics]
-        map="
-, 2
-3 , *
-, 1
-* , *
-, *"
-        [tile]
-            pos=1
-            type={ADJACENT1}
-            no_flag={FLAG}-connect-@R0
-        [/tile]
-        [tile]
-            pos=2
-            type={TERRAINLIST}
-           has_flag={FLAG}-connect-@R3
-        [/tile]
-        [tile]
-            pos=3
-            type={ADJACENT2}
-        [/tile]
-
-        {IMAGEC_LN {LAYER} {IMAGESTEM} -@R0}
-        #{IMAGEC_LN 8 void ()}
-        probability={PROB}
-        rotations=n,ne,se,s,sw,nw
-    [/terrain_graphics]
-#enddef
-
-#define TRACK_ANGLE_CCW_PLF TERRAINLIST ADJACENT1 ADJACENT2 PROB LAYER FLAG 
IMAGESTEM
-    [terrain_graphics]
-        map="
-, 3
-2 , *
-, 1
-* , *
-, *"
-        [tile]
-            pos=1
-            type={ADJACENT1}
-            no_flag={FLAG}-@R0,{FLAG}-connect-@R0
-            set_flag={FLAG}-@R0
-        [/tile]
-        [tile]
-            pos=2
-            type={TERRAINLIST}
-            no_flag={FLAG}-@R3
-            set_flag={FLAG}-@R3
-           has_flag={FLAG}-connect-@R3
-        [/tile]
-        [tile]
-            pos=3
-            type={ADJACENT2}
-        [/tile]
-
-        {IMAGEC_LN {LAYER} {IMAGESTEM} -@R0}
-        probability={PROB}
-        rotations=n,ne,se,s,sw,nw
-    [/terrain_graphics]
-#enddef
-

Modified: trunk/data/core/terrain-graphics/tracks.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/tracks.cfg?rev=44091&r1=44090&r2=44091&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/tracks.cfg (original)
+++ trunk/data/core/terrain-graphics/tracks.cfg Sat Jul 10 19:42:47 2010
@@ -66,10 +66,6 @@
 #meta-macro TRACK SE_NW_TERRAIN N_S_TERRAIN NE_SW_TERRAIN L=LAYER=-80 
F=FLAG=overlay IMAGESTEM
 #meta-macro TRACK_BORDER_RESTRICTED TERRAINLIST ADJACENT P=PROB=100 
L=LAYER=-80 F=FLAG=overlay IMAGESTEM
 #meta-macro TRACK_BORDER_RESTRICTED_RANDOM TERRAINLIST ADJACENT L=LAYER=-80 
F=FLAG=overlay IMAGESTEM
-#meta-macro TRACK_ANGLE_CW TERRAINLIST ADJACENT1 ADJACENT2 P=PROB=100 
L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#meta-macro TRACK_ANGLE_RANDOM_CW TERRAINLIST ADJACENT1 ADJACENT2 
L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#meta-macro TRACK_ANGLE_CCW TERRAINLIST ADJACENT1 ADJACENT2 P=PROB=100 
L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#meta-macro TRACK_ANGLE_RANDOM_CCW TERRAINLIST ADJACENT1 ADJACENT2 
L=LAYER=-80 F=FLAG=overlay IMAGESTEM
 
 
#####################################################################################################
 ###############        AUTO GENERATED CODE        
###################################################
@@ -125,79 +121,3 @@
     {TRACK_BORDER_RESTRICTED_RANDOM_LF ({TERRAINLIST}) ({ADJACENT}) -80 
overlay ({IMAGESTEM})}
 #enddef
 #end of generated code
-#The following code is autogenerated by expand-terrain-macros.py
-#generated from: #meta-macro TRACK_ANGLE_CW TERRAINLIST ADJACENT1 ADJACENT2 
P=PROB=100 L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#Please do not modify
-#define TRACK_ANGLE_CW_LF TERRAINLIST ADJACENT1 ADJACENT2 LAYER FLAG 
IMAGESTEM
-    {TRACK_ANGLE_CW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 100 
({LAYER}) ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CW_PF TERRAINLIST ADJACENT1 ADJACENT2 PROB FLAG IMAGESTEM
-    {TRACK_ANGLE_CW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) ({PROB}) 
-80 ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CW_F TERRAINLIST ADJACENT1 ADJACENT2 FLAG IMAGESTEM
-    {TRACK_ANGLE_CW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 100 -80 
({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CW_PL TERRAINLIST ADJACENT1 ADJACENT2 PROB LAYER 
IMAGESTEM
-    {TRACK_ANGLE_CW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) ({PROB}) 
({LAYER}) overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CW_L TERRAINLIST ADJACENT1 ADJACENT2 LAYER IMAGESTEM
-    {TRACK_ANGLE_CW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 100 
({LAYER}) overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CW_P TERRAINLIST ADJACENT1 ADJACENT2 PROB IMAGESTEM
-    {TRACK_ANGLE_CW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) ({PROB}) 
-80 overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CW TERRAINLIST ADJACENT1 ADJACENT2 IMAGESTEM
-    {TRACK_ANGLE_CW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 100 -80 
overlay ({IMAGESTEM})}
-#enddef
-#end of generated code
-#The following code is autogenerated by expand-terrain-macros.py
-#generated from: #meta-macro TRACK_ANGLE_RANDOM_CW TERRAINLIST ADJACENT1 
ADJACENT2 L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#Please do not modify
-#define TRACK_ANGLE_RANDOM_CW_F TERRAINLIST ADJACENT1 ADJACENT2 FLAG 
IMAGESTEM
-    {TRACK_ANGLE_RANDOM_CW_LF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 
-80 ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_RANDOM_CW_L TERRAINLIST ADJACENT1 ADJACENT2 LAYER 
IMAGESTEM
-    {TRACK_ANGLE_RANDOM_CW_LF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 
({LAYER}) overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_RANDOM_CW TERRAINLIST ADJACENT1 ADJACENT2 IMAGESTEM
-    {TRACK_ANGLE_RANDOM_CW_LF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 
-80 overlay ({IMAGESTEM})}
-#enddef
-#end of generated code
-#The following code is autogenerated by expand-terrain-macros.py
-#generated from: #meta-macro TRACK_ANGLE_CCW TERRAINLIST ADJACENT1 ADJACENT2 
P=PROB=100 L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#Please do not modify
-#define TRACK_ANGLE_CCW_LF TERRAINLIST ADJACENT1 ADJACENT2 LAYER FLAG 
IMAGESTEM
-    {TRACK_ANGLE_CCW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 100 
({LAYER}) ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CCW_PF TERRAINLIST ADJACENT1 ADJACENT2 PROB FLAG 
IMAGESTEM
-    {TRACK_ANGLE_CCW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 
({PROB}) -80 ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CCW_F TERRAINLIST ADJACENT1 ADJACENT2 FLAG IMAGESTEM
-    {TRACK_ANGLE_CCW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 100 -80 
({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CCW_PL TERRAINLIST ADJACENT1 ADJACENT2 PROB LAYER 
IMAGESTEM
-    {TRACK_ANGLE_CCW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 
({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CCW_L TERRAINLIST ADJACENT1 ADJACENT2 LAYER IMAGESTEM
-    {TRACK_ANGLE_CCW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 100 
({LAYER}) overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CCW_P TERRAINLIST ADJACENT1 ADJACENT2 PROB IMAGESTEM
-    {TRACK_ANGLE_CCW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 
({PROB}) -80 overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_CCW TERRAINLIST ADJACENT1 ADJACENT2 IMAGESTEM
-    {TRACK_ANGLE_CCW_PLF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 100 -80 
overlay ({IMAGESTEM})}
-#enddef
-#end of generated code
-#The following code is autogenerated by expand-terrain-macros.py
-#generated from: #meta-macro TRACK_ANGLE_RANDOM_CCW TERRAINLIST ADJACENT1 
ADJACENT2 L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#Please do not modify
-#define TRACK_ANGLE_RANDOM_CCW_F TERRAINLIST ADJACENT1 ADJACENT2 FLAG 
IMAGESTEM
-    {TRACK_ANGLE_RANDOM_CCW_LF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 
-80 ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_RANDOM_CCW_L TERRAINLIST ADJACENT1 ADJACENT2 LAYER 
IMAGESTEM
-    {TRACK_ANGLE_RANDOM_CCW_LF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 
({LAYER}) overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_ANGLE_RANDOM_CCW TERRAINLIST ADJACENT1 ADJACENT2 IMAGESTEM
-    {TRACK_ANGLE_RANDOM_CCW_LF ({TERRAINLIST}) ({ADJACENT1}) ({ADJACENT2}) 
-80 overlay ({IMAGESTEM})}
-#enddef
-#end of generated code




Related Messages


Powered by MHonArc, Updated Sat Jul 10 22:00:09 2010