Fixed a bug where tall units were drawn under castles, thus being "beheaded"

data/built.cfg

@@ -3,7 +3,8 @@
 C
   C
 !KC"
-	image_background="castle-wall-concave-$R"
+	image_background="castle-bg-concave-$R"
+	image_foreground="castle-fg-concave-$R"
 	rotations=ne,e,se,sw,w,nw
 [/building_rule]
 
@@ -17,7 +18,8 @@ C"
 		pos=1
 		type=!KC
 	[/tile]
-	image_background="castle-wall-convex-$R"
+	image_background="castle-bg-convex-$R"
+	image_foreground="castle-fg-convex-$R"
 	rotations=ne,e,se,sw,w,nw
 [/building_rule]
 
@@ -32,7 +34,8 @@ C
 		type=K
 	[/tile]
 
-	image_foreground="keep-inside-$R"
+	image_background="keep-bg-inside-$R"
+	image_foreground="keep-fg-inside-$R"
 	rotations=ne,e,se,sw,w,nw
 [/building_rule]
 
@@ -47,7 +50,8 @@ K"
 		y=0
 		type=!KC
 	[/tile]
-	image_background="keep-wall-$R"
+	image_background="keep-bg-wall-$R"
+	image_foreground="keep-fg-wall-$R"
 	rotations=ne,e,se,sw,w,nw
 [/building_rule]
 
@@ -57,7 +61,8 @@ C
   !KC
 K"
 
-	image_foreground="keep-wall-0-$R"
+	image_background="keep-bg-wall-0-$R"
+	image_foreground="keep-fg-wall-0-$R"
 	rotations=ne,e,se,sw,w,nw
 [/building_rule]
 
@@ -67,46 +72,47 @@ K"
   C
 K"
 
-	image_foreground="keep-wall-1-$R"
+	image_background="keep-bg-wall-1-$R"
+	image_foreground="keep-fg-wall-1-$R"
 	rotations=ne,e,se,sw,w,nw
 [/building_rule]
 
 # Some test cases
 
-[building_rule]
-	map="
-.   1
-  .
-.   1
-  .
-.   1
-  1
-1"
-	[tile]
-		pos=1
-		type=m
-	[/tile]
-
-	probability=30
-	no_flag="built-m"
-	set_flag="built-m"
-	
-	image_background="mountains-test"
-[/building_rule]
-
-[building_rule]
-	[tile]
-		x=0
-		y=0
-		type=m
-	[/tile]
-	probability=20
-	no_flag="built-m"
-	set_flag="built-m"
-	image_background="mountains-test-2"
-[/building_rule]
-
-
+#[building_rule]
+#	map="
+#.   1
+#  .
+#.   1
+#  .
+#.   1
+#  1
+#1"
+#	[tile]
+#		pos=1
+#		type=m
+#	[/tile]
+#
+#	probability=30
+#	no_flag="built-m"
+#	set_flag="built-m"
+#	
+#	image_background="mountains-test"
+#[/building_rule]
+#
+#[building_rule]
+#	[tile]
+#		x=0
+#		y=0
+#		type=m
+#	[/tile]
+#	probability=20
+#	no_flag="built-m"
+#	set_flag="built-m"
+#	image_background="mountains-test-2"
+#[/building_rule]
+#
+#
 # A stupid test case, just to demonstrate the has_flag condition
 
 #[building_rule]