[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/05 18:29:20

Modified files:
        data           : terrain-graphics.cfg 
Added files:
        data/terrain-graphics: forests.cfg 
Removed files:
        data/terrain-graphics: adjacent-north.cfg 

Log message:
        Fixed villages being over tree tops.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics.cfg.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics/forests.cfg?rev=1.1

Patches:
Index: wesnoth/data/terrain-graphics.cfg
diff -u wesnoth/data/terrain-graphics.cfg:1.39 
wesnoth/data/terrain-graphics.cfg:1.40
--- wesnoth/data/terrain-graphics.cfg:1.39      Sun Oct  3 10:57:37 2004
+++ wesnoth/data/terrain-graphics.cfg   Tue Oct  5 18:29:20 2004
@@ -184,13 +184,9 @@
 {BUILDING_FLAG K ({VIMG 36,40 tent}) keep-of-n}
 {BUILDING_FLAG K ({VIMG 36,40 dwarven-keep}) keep-of-o}
 
-# Forest, hills and mountains should always overlay on northern sides
-#{TERRAIN_ADJACENT_NORTH    -90        m  !m   mountains}
-#{TERRAIN_ADJACENT_NORTH    -90        H  !H   snow-hills}
-#{TERRAIN_ADJACENT_NORTH    -90        h  !hm  hills} # No adj-north between 
hills and mountains
-
-{TERRAIN_ADJACENT_OV       -78         F      !F      snow-forest}
-{TERRAIN_ADJACENT_OV       -79         f      !f      forest}
+# {TERRAIN_ADJACENT_OV       -78         F      !F      snow-forest}
+{TERRAIN_ADJACENT_VERTICAL             F      !F      snow-forest}
+{TERRAIN_ADJACENT_VERTICAL             f      !f      forest}
 {TERRAIN_ADJACENT          -188        m      !m      mountains}
 {TERRAIN_ADJACENT          -189        H      !H      snow-hills}
 {TERRAIN_ADJACENT          -190        h      !h      hills}