[Wesnoth-cvs-commits] wesnoth/data terrain-graphics.cfg terrain-graph...

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      04/10/25 19:51:12

Modified files:
        data           : terrain-graphics.cfg 
        data/terrain-graphics: bridges.cfg 

Log message:
        Fixed bridge ends not working well with some kinds of terrains

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics.cfg.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics/bridges.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: wesnoth/data/terrain-graphics.cfg
diff -u wesnoth/data/terrain-graphics.cfg:1.45 
wesnoth/data/terrain-graphics.cfg:1.46
--- wesnoth/data/terrain-graphics.cfg:1.45      Sat Oct 16 16:34:34 2004
+++ wesnoth/data/terrain-graphics.cfg   Mon Oct 25 19:51:12 2004
@@ -86,7 +86,7 @@
 {TERRAIN_BASE                 ~ fog}
 
 {CANYON X canyon}
-{BRIDGE \ | / cs bridge}
+{BRIDGE \ | / cs CKfF bridge}
 
 #
 # Villages
@@ -133,7 +133,8 @@
 {TERRAIN_BASE C castle}
 {TERRAIN_BASE o dwarven-castle-floor}
 {TERRAIN_BASE n dirt}
-{TERRAIN_BASE O orccastle}
+#{TERRAIN_BASE O orccastle}
+
 {TERRAIN_BASE_FLAG K keep-of-C castle}
 {TERRAIN_BASE_FLAG K keep-of-o dwarven-keep-floor}
 {TERRAIN_BASE_FLAG K keep-of-n dirt}
Index: wesnoth/data/terrain-graphics/bridges.cfg
diff -u wesnoth/data/terrain-graphics/bridges.cfg:1.2 
wesnoth/data/terrain-graphics/bridges.cfg:1.3
--- wesnoth/data/terrain-graphics/bridges.cfg:1.2       Wed Oct 13 19:52:31 2004
+++ wesnoth/data/terrain-graphics/bridges.cfg   Mon Oct 25 19:51:12 2004
@@ -1,5 +1,5 @@
 
-#define BRIDGE SE_NW N_S NE_SW WATER IMAGE
+#define BRIDGE SE_NW N_S NE_SW WATER NOTERM IMAGE
 
 {TERRAIN_BASE_OV {N_S}  {IMAGE}-n-s}
 {TERRAIN_BASE_OV {NE_SW}  {IMAGE}-ne-sw}
@@ -18,7 +18,7 @@
        [/tile]
        [tile]
                pos=2
-               type=!{N_S}{WATER}
+               type=!{N_S}{WATER}{NOTERM}
                [image]
                        layer=-80
                        name={IMAGE}-s
@@ -39,7 +39,7 @@
        [/tile]
        [tile]
                pos=2
-               type=!{NE_SW}{WATER}
+               type=!{NE_SW}{WATER}{NOTERM}
                [image]
                        layer=-80
                        name={IMAGE}-sw
@@ -60,7 +60,7 @@
        [/tile]
        [tile]
                pos=2
-               type=!{SE_NW}{WATER}
+               type=!{SE_NW}{WATER}{NOTERM}
                [image]
                        layer=-80
                        name={IMAGE}-nw
@@ -81,7 +81,7 @@
        [/tile]
        [tile]
                pos=2
-               type=!{N_S}{WATER}
+               type=!{N_S}{WATER}{NOTERM}
                [image]
                        layer=-80
                        name={IMAGE}-n
@@ -102,7 +102,7 @@
        [/tile]
        [tile]
                pos=2
-               type=!{NE_SW}{WATER}
+               type=!{NE_SW}{WATER}{NOTERM}
                [image]
                        layer=-80
                        name={IMAGE}-ne
@@ -123,7 +123,7 @@
        [/tile]
        [tile]
                pos=2
-               type=!{SE_NW}{WATER}
+               type=!{SE_NW}{WATER}{NOTERM}
                [image]
                        layer=-80
                        name={IMAGE}-se