From 5b570f0f6a3960a1237d071ee9fd90ab846567ff Mon Sep 17 00:00:00 2001
From: Philippe Plantier <ayin@anathas.org>
Date: Wed, 13 Apr 2005 20:36:59 +0000
Subject: [PATCH] Fixed bug #12658 : new forest being drawn on top of units.

---
 data/terrain-graphics.cfg | 10 +++++-----
 src/builder.cpp           |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/data/terrain-graphics.cfg b/data/terrain-graphics.cfg
index 503def3a06a..83482a8e6ed 100644
--- a/data/terrain-graphics.cfg
+++ b/data/terrain-graphics.cfg
@@ -42,7 +42,7 @@
          [image]
                  name={TILE}
                  position=vertical
-                 base=90, 108
+                 base=90,144
          [/image]
 
 
@@ -78,7 +78,7 @@
          [image]
                  name={TILE}
                  position=vertical
-                 base=90, 108
+                 base=90,144
          [/image]
 
 
@@ -114,7 +114,7 @@
          [image]
                  name={TILE}
                  position=vertical
-                 base=90, 108
+                 base=90,144
          [/image]
 
 
@@ -150,7 +150,7 @@
          [image]
                  name={TILE}-@R0
                  position=vertical
-                 base=90, 108
+                 base=90,144
          [/image]
 
 
@@ -190,7 +190,7 @@
          [image]
                  name={TILE}
                  position=vertical
-                 base=90, 108
+                 base=90,144
          [/image]
 
 
diff --git a/src/builder.cpp b/src/builder.cpp
index ab0360b20c9..e38075f8296 100644
--- a/src/builder.cpp
+++ b/src/builder.cpp
@@ -371,6 +371,9 @@ terrain_builder::terrain_constraint terrain_builder::rotate(const terrain_builde
 
 		itor->basex = int(rx + rule_image::TILEWIDTH/2);
 		itor->basey = int(ry + rule_image::TILEWIDTH/2);
+
+		//std::cerr << "Rotation: from " << vx << ", " << vy << " to " << itor->basex <<
+		//	", " << itor->basey << "\n";
 	}
 
 	return ret;
@@ -544,7 +547,7 @@ void terrain_builder::add_constraints(
 	if(!type.empty())
 		constraints[loc].terrain_types = type;			
 	
-	int x = loc.x * rule_image::TILEWIDTH / 2;
+	int x = loc.x * rule_image::TILEWIDTH * 3 / 4;
 	int y = loc.y * rule_image::TILEWIDTH + (loc.x % 2) * 
 		rule_image::TILEWIDTH / 2;
 	add_images_from_config(constraints[loc].images, global_images, true, x, y);