# HG changeset patch
# User Darkvater <Darkvater@openttd.org>
# Date 1160601653 0
# Node ID 7928282c21e6933bd4665c14799945851e07bdb4
# Parent  241e10513c52afa7c3d1e9d65c0a1b602c44dbe4
(svn r6739) -Fix (r6001): Crash on removing farmland belonging to a farm. The search would loop
 around the edges causing some troubles. Also make sure that the land after
 farm removal is not barren but 2/3rd grass. Better suited.

diff --git a/clear_cmd.c b/clear_cmd.c
--- a/clear_cmd.c
+++ b/clear_cmd.c
@@ -682,7 +682,7 @@
 
 			if (GetIndustryIndexOfField(tile) == INVALID_INDUSTRY && GetFieldType(tile) >= 7) {
 				/* This farmfield is no longer farmfield, so make it grass again */
-				MakeClear(tile, CLEAR_GRASS, 0);
+				MakeClear(tile, CLEAR_GRASS, 2);
 			} else {
 				field_type = GetFieldType(tile);
 				field_type = (field_type < 8) ? field_type + 1 : 0;
diff --git a/industry_cmd.c b/industry_cmd.c
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -147,6 +147,7 @@
 	if (i->type == IT_FARM || i->type == IT_FARM_2) {
 		/* Remove the farmland and convert it to regular tiles over time. */
 		BEGIN_TILE_LOOP(tile_cur, 42, 42, i->xy - TileDiffXY(21, 21)) {
+			tile_cur = TILE_MASK(tile_cur);
 			if (IsTileType(tile_cur, MP_CLEAR) && IsClearGround(tile_cur, CLEAR_FIELDS) &&
 					GetIndustryIndexOfField(tile_cur) == i->index) {
 				SetIndustryIndexOfField(tile_cur, INVALID_INDUSTRY);