cpp/openttd-patchpack/source Changeset - r7637:c3b74372b047

Changeset - r7637:c3b74372b047

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 17 years ago 2007-09-26 14:14:51
rubidium@openttd.org

(svn r11168) -Fix [FS#1256]: assert on terraforming of industries. Patch by frosch.

2 files changed with 3 insertions and 2 deletions:

src/clear_cmd.cpp

src/industry_cmd.cpp

0 comments (0 inline, 0 general)

src/clear_cmd.cpp

➞

Show inline comments

@@ @@ -314,7 +314,7 @@ CommandCost CmdTerraformLand(TileIndex t @@
 				return_cmd_error(STR_1002_EXCAVATION_WOULD_DAMAGE);
+			}
 			/* Check tiletype-specific things, and add extra-cost */
 			CommandCost cost = _tile_type_procs[GetTileType(tile)]->terraform_tile_proc(tile, flags, z_min * TILE_HEIGHT, (Slope) tileh);
+			CommandCost cost = _tile_type_procs[GetTileType(tile)]->terraform_tile_proc(tile, flags | DC_AUTO, z_min * TILE_HEIGHT, (Slope) tileh);
 			if (CmdFailed(cost)) {
 				_terraform_err_tile = tile;
 				return cost;

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -385,6 +385,7 @@ static CommandCost ClearTile_Industry(Ti @@
 	 */
 	if ((_current_player != OWNER_WATER && _game_mode != GM_EDITOR &&
 			!_cheats.magic_bulldozer.value) ||
 			((flags & DC_AUTO) != 0) ||
 			(_current_player == OWNER_WATER && (indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER))) {
 		SetDParam(0, indspec->name);
 		return_cmd_error(STR_4800_IN_THE_WAY);
@@ @@ -2019,7 +2020,7 @@ static CommandCost TerraformTile_Industr @@
+			}
+		}
+	}
-	return DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); // funny magic bulldozer
 	return DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
+}
 extern const TileTypeProcs _tile_type_industry_procs = {

0 comments (0 inline, 0 general)