Adding christophe33's canyons (terrain letter: X). Those still need to be fixed.

data/scenario-test.cfg

@@ -1,12 +1,12 @@
 [test]
 	name=Scenario 1: The Elves Besieged
-	map_data="ggggggggggggggggggggggggggggggggggggg
-ggggggggggggggggggggggggggggggggggggg
-ggggggggggggggggggggggggggggggggggggg
-ggggggg1Cgggggggggfffffgggggggggggggg
-ggggggggCgggggggggfffffgggccccggggggg
-ggggggggggggggggggfffffgggcchhggggggg
-ggggggggggggggggggggggggggccccggggggg
+	map_data="mmmmggggggggggggggggggggggggggggggggg
+mmmmggggggggggggggggggggggggggggggggg
+mgggggCCCCggggggggggggggggggggggggggg
+mgggggC1Cgggggggggfffffgggggggggggggg
+mgggggCCCgggggggggfffffgggccccggggggg
+mgggggCCCgggggggggfffffgggcchhggggggg
+mgggggggggggggggggggggggggccccggggggg
 ggggggggggggggggggggggggggggggggggggg
 ggggggggggggggggggggggggggggggggggggg
 ggggggggggggggggggggggggggggggggggggg
@@ -78,7 +78,7 @@ ggggggggggggggggggggggggggggggggggggg
 	controller=human
 	hitpoints=80
 	recruit=Assassin,Elvish Hero,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish Shaman,Red Mage,Spearman,Swordsman,Duelist,Fencer,Elvish Captain,Elvish Ranger,Elvish Shyde,Thief,Rogue,Merman,Elvish Lord,White Mage,Mage of Light,Elvish Sharpshooter,Merman Lord
-	gold=20
+	gold=2000
 	enemy=2
 	[/side]
 
@@ -117,5 +117,29 @@ ggggggggggggggggggggggggggggggggggggg
 		letter=C
 		[/terrain]
 	[/event]
+
+	[item]
+	x,y=4,4
+	image=items/orcish-flag.png
+	[/item]
+	[label]
+	x,y=4,4
+	id=open_the_path
+	text="Open, Sesame!"
+	[/label]
+	[event]
+	name=moveto
+	first_time_only=no
+		[filter]
+		side=1
+		x=4
+		y=4
+		[/filter]
+		[terrain]
+		x=1,2
+		y=2,2
+		letter=r
+		[/terrain]
+	[/event]
 [/test]
 

data/terrain-graphics.cfg

@@ -145,7 +145,7 @@
 {TERRAIN_ADJACENT_12    -190        H      !H      snow-hills}
 {TERRAIN_ADJACENT_12    -191        h      !h      hills}
 {TERRAIN_ADJACENT_1234  -192        SV     !SV     snow}
-{TERRAIN_ADJACENT_1234  -193        tgv    !tgvX   grassland}
+{TERRAIN_ADJACENT_1234  -193        tgvX   !tgvX   grassland}
 {TERRAIN_ADJACENT_1     -194        r      !r      dirt}
 {TERRAIN_ADJACENT_1     -195        R      !R      road}        # Missing gfx
 {TERRAIN_ADJACENT_1     -196        d      !d      desert}

data/terrain-graphics/canyon.cfg

@@ -0,0 +1,388 @@
+
+#define TRANS_0 LETTER
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	    no_flag=canyon-nt-@R3
+	[/tile]
+#enddef
+#define TRANS_1 LETTER
+  	[tile]
+	    pos=3
+	    type={LETTER}
+	    no_flag=canyon-nt-@R4
+	[/tile]
+#enddef
+#define TRANS_2 LETTER
+  	[tile]
+	    pos=4
+	    type={LETTER}
+	    no_flag=canyon-nt-@R5
+	[/tile]
+#enddef
+#define TRANS_3 LETTER
+  	[tile]
+	    pos=5
+	    type={LETTER}
+	    no_flag=canyon-nt-@R0
+	[/tile]
+#enddef
+#define TRANS_4 LETTER
+  	[tile]
+	    pos=6
+	    type={LETTER}
+	    no_flag=canyon-nt-@R1
+	[/tile]
+#enddef
+#define TRANS_5 LETTER
+  	[tile]
+	    pos=7
+	    type={LETTER}
+	    no_flag=canyon-nt-@R2
+	[/tile]
+#enddef
+
+#define CANYON LETTER IMAGE
+
+# Angles should not loop
+[terrain_graphics]
+	map="
+1
+  3
+2   1 
+  .
+1   ."
+	[tile]
+		pos=1
+		type={LETTER}
+	[/tile]
+	[tile]
+		pos=2
+		type={LETTER}
+		set_flag=canyon-nt-@R1
+	[/tile]
+	[tile]
+		pos=3
+		type={LETTER}
+		set_flag=canyon-nt-@R4
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+7   3
+  1
+6   4
+  5"
+  	{TRANS_0 {LETTER}}
+  	{TRANS_1 {LETTER}}
+  	{TRANS_2 {LETTER}}
+  	{TRANS_3 {LETTER}}
+  	{TRANS_4 {LETTER}}
+  	{TRANS_5 {LETTER}}
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-all
+	    [/image]
+	    no_flag="terrain-base"
+	    set_flag="terrain-base"
+	[/tile]
+#	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   3
+  1
+6   4
+  5"
+  	{TRANS_0 {LETTER}}
+  	{TRANS_1 {LETTER}}
+  	{TRANS_2 {LETTER}}
+  	{TRANS_3 {LETTER}}
+  	{TRANS_4 {LETTER}}
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	[/tile]
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-@R0-@R1-@R2-@R3-@R4
+	    [/image]
+	    no_flag=terrain-base
+	    set_flag=terrain-base,canyon-nt-@R5
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   3
+  1
+.   4
+  5"
+  	{TRANS_0 {LETTER}}
+  	{TRANS_1 {LETTER}}
+  	{TRANS_2 {LETTER}}
+  	{TRANS_3 {LETTER}}
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	[/tile]
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-@R0-@R1-@R2-@R3
+	    [/image]
+	    no_flag=terrain-base
+	    set_flag=terrain-base,canyon-nt-@R4,canyon-nt-@R5
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   3
+  1
+6   4
+  ."
+  	{TRANS_0 {LETTER}}
+  	{TRANS_1 {LETTER}}
+  	{TRANS_2 {LETTER}}
+  	{TRANS_4 {LETTER}}
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	[/tile]
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-@R0-@R1-@R2-@R4
+	    [/image]
+	    no_flag=terrain-base
+	    set_flag=terrain-base,canyon-nt-@R3,canyon-nt-@R5
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   3
+  1
+.   4
+  ."
+  	{TRANS_0 {LETTER}}
+  	{TRANS_1 {LETTER}}
+  	{TRANS_2 {LETTER}}
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	[/tile]
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-@R0-@R1-@R2
+	    [/image]
+	    no_flag=terrain-base
+	    set_flag=terrain-base,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   3
+  1
+6   .
+  ."
+  	{TRANS_0 {LETTER}}
+  	{TRANS_1 {LETTER}}
+  	{TRANS_4 {LETTER}}
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	[/tile]
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-@R0-@R1-@R4
+	    [/image]
+	    no_flag="terrain-base"
+	    set_flag=terrain-base,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R5
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   3
+  1
+.   .
+  5"
+  	{TRANS_0 {LETTER}}
+  	{TRANS_1 {LETTER}}
+  	{TRANS_3 {LETTER}}
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	[/tile]
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-@R0-@R1-@R3
+	    [/image]
+	    no_flag=terrain-base
+	    set_flag=terrain-base,canyon-nt-@R2,canyon-nt-@R4,canyon-nt-@R5
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   3
+  1
+.   .
+  ."
+  	{TRANS_0 {LETTER}}
+  	{TRANS_1 {LETTER}}
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	[/tile]
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-@R0-@R1
+	    [/image]
+	    no_flag="terrain-base"
+	    set_flag=terrain-base,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   .
+  1
+.   .
+  5"
+  	{TRANS_0 {LETTER}}
+  	{TRANS_3 {LETTER}}
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	[/tile]
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-@R0-@R3
+	    [/image]
+	    no_flag="terrain-base"
+	    set_flag=terrain-base,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R4,canyon-nt-@R5
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   .
+  1
+.   4
+  ."
+  	{TRANS_0 {LETTER}}
+  	{TRANS_2 {LETTER}}
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	[/tile]
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-@R0-@R2
+	    [/image]
+	    no_flag="terrain-base"
+	    set_flag=terrain-base,canyon-nt-@R1,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   .
+  1
+.   .
+  ."
+  	{TRANS_0 {LETTER}}
+  	[tile]
+	    pos=2
+	    type={LETTER}
+	[/tile]
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}-@R0
+	    [/image]
+	    no_flag="terrain-base"
+	    set_flag=terrain-base,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
+	[/tile]
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  .
+.   .
+  1
+.   .
+  ."
+  	[tile]
+	    pos=1
+	    type={LETTER}
+	    [image]
+	        layer=-1000
+		name={IMAGE}
+	    [/image]
+	    no_flag="terrain-base"
+	    set_flag=terrain-base,canyon-nt-@R0,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
+	[/tile]
+#	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+#enddef
+

data/terrain.cfg

@@ -253,11 +253,11 @@ recruit_from=true
 recruit_onto=true
 [/terrain]
 
-#[terrain]
-#image=canyon
-#name=canyon
-#char=X
-#[/terrain]
+[terrain]
+image=canyon-n-s
+name=canyon
+char=X
+[/terrain]
 
 # 'y' and 'z' are reserved chars
 # They can be used at the discretion of campaign designers

src/builder.cpp

@@ -155,6 +155,9 @@ const terrain_builder::imagelist *terrain_builder::get_terrain_at(const gamemap:
 
 bool terrain_builder::update_animation(const gamemap::location &loc)
 {
+	if(!tile_map_.on_map(loc))
+		return false;
+
 	imagelist& bg = tile_map_[loc].images_background;
 	imagelist& fg = tile_map_[loc].images_foreground;
 	bool changed = false;
@@ -188,7 +191,8 @@ void terrain_builder::rebuild_terrain(const gamemap::location &loc)
 	}
 }
 
-void terrain_builder::rebuild_all() {
+void terrain_builder::rebuild_all()
+{
 	tile_map_.reset();
 	terrain_by_type_.clear();
 	terrain_by_type_border_.clear();