summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-10-11 21:20:53 +0000
committerDarkvater <darkvater@openttd.org>2006-10-11 21:20:53 +0000
commite262669eb609644756a3f6cd9579791651e5b176 (patch)
tree7bffa57d62c9f8362c589b73e0bb029dd9b4daf2
parent1926d978884ce5d0a5b9765ec0281281dfee4409 (diff)
downloadopenttd-e262669eb609644756a3f6cd9579791651e5b176.tar.xz
(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.
-rw-r--r--clear_cmd.c2
-rw-r--r--industry_cmd.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/clear_cmd.c b/clear_cmd.c
index 0093d8bca..9ebd9e8bd 100644
--- a/clear_cmd.c
+++ b/clear_cmd.c
@@ -682,7 +682,7 @@ static void TileLoop_Clear(TileIndex tile)
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
index 07f1de47b..a1abefbea 100644
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -147,6 +147,7 @@ void DestroyIndustry(Industry *i)
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);