openttd-ottdgrfs: comparison src/terraform

equal deleted inserted replaced

-:eec5a7dcbf61
+:fcf5fb2548eb
 	TileIndex tile;   ///< Referenced tile.
 	byte height;      ///< New TileHeight (height of north corner) of the tile.
 };
 struct TerraformerState {
-	int modheight_count;                                         ///< amount of entries in "modheight".
+	int modheight_count;  ///< amount of entries in "modheight".
-	int tile_table_count;                                        ///< amount of entries in "tile_table".
+	int tile_table_count; ///< amount of entries in "tile_table".
 	/**
 	 * Dirty tiles, i.e.\ at least one corner changed.
 	 *
 	 * This array contains the tiles which are or will be marked as dirty.
 	 */
 	TileIndex tile_table[TERRAFORMER_TILE_TABLE_SIZE];
 	TerraformerHeightMod modheight[TERRAFORMER_MODHEIGHT_SIZE];  ///< Height modifications.
 };
-TileIndex _terraform_err_tile;
+TileIndex _terraform_err_tile; ///< first tile we couldn't terraform
 /**
 * Gets the TileHeight (height of north corner) of a tile as of current terraforming progress.
 *
 * @param ts TerraformerState.
 * @param tile Tile.
 * @return TileHeight.
 */
-static int TerraformGetHeightOfTile(TerraformerState *ts, TileIndex tile)
+static int TerraformGetHeightOfTile(const TerraformerState *ts, TileIndex tile)
 {
-	TerraformerHeightMod *mod = ts->modheight;
+	const TerraformerHeightMod *mod = ts->modheight;
-	int count;
+	for (int count = ts->modheight_count; count != 0; count--, mod++) {
-	for (count = ts->modheight_count; count != 0; count--, mod++) {
 		if (mod->tile == tile) return mod->height;
 	}
 	/* TileHeight unchanged so far, read value from map. */
 	return TileHeight(tile);
 	/* Find tile in the "modheight" table.
 	 * Note: In a normal user-terraform command the tile will not be found in the "modheight" table.
 	 *       But during house- or industry-construction multiple corners can be terraformed at once. */
 	TerraformerHeightMod *mod = ts->modheight;
 	int count = ts->modheight_count;
 	while ((count > 0) && (mod->tile != tile)) {
 		mod++;
 		count--;
 	}
 * @param tile Tile.
 * @ingroup dirty
 */
 static void TerraformAddDirtyTile(TerraformerState *ts, TileIndex tile)
 {
-	int count;
+	int count = ts->tile_table_count;
-	TileIndex *t;
+	for (TileIndex *t = ts->tile_table; count != 0; count--, t++) {
-	count = ts->tile_table_count;
-	for (t = ts->tile_table; count != 0; count--, t++) {
 		if (*t == tile) return;
 	}
 	assert(ts->tile_table_count < TERRAFORMER_TILE_TABLE_SIZE);
 * @param height Aimed height.
 * @param return Error code or cost.
 */
 static CommandCost TerraformTileHeight(TerraformerState *ts, TileIndex tile, int height)
 {
-	CommandCost total_cost(EXPENSES_CONSTRUCTION);
 	assert(tile < MapSize());
 	/* Check range of destination height */
 	if (height < 0) return_cmd_error(STR_1003_ALREADY_AT_SEA_LEVEL);
 	if (height > MAX_TILE_HEIGHT) return_cmd_error(STR_1004_TOO_HIGH);
 	TerraformAddDirtyTileAround(ts, tile);
 	/* Store the height modification */
 	TerraformSetHeightOfTile(ts, tile, height);
+	CommandCost total_cost(EXPENSES_CONSTRUCTION);
 	/* Increment cost */
 	total_cost.AddCost(_price.terraform);
 	/* Recurse to neighboured corners if height difference is larger than 1 */
 	{
 * @param p2 direction; eg up (non-zero) or down (zero)
 * @return error or cost of terraforming
 */
 CommandCost CmdTerraformLand(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
-	TerraformerState ts;
+	/* Make an extra check for map-bounds cause we add tiles to the originating tile */
+	if (tile + TileDiffXY(1, 1) >= MapSize()) return CMD_ERROR;
+	_terraform_err_tile = INVALID_TILE;
 	CommandCost total_cost(EXPENSES_CONSTRUCTION);
 	int direction = (p2 != 0 ? 1 : -1);
+	TerraformerState ts;
-	_terraform_err_tile = 0;
 	ts.modheight_count = ts.tile_table_count = 0;
-	/* Make an extra check for map-bounds cause we add tiles to the originating tile */
-	if (tile + TileDiffXY(1, 1) >= MapSize()) return CMD_ERROR;
 	/* Compute the costs and the terraforming result in a model of the landscape */
 	if ((p1 & SLOPE_W) != 0) {
 		TileIndex t = tile + TileDiffXY(1, 0);
 		CommandCost cost = TerraformTileHeight(&ts, t, TileHeight(t) + direction);
 		total_cost.AddCost(cost);
 	}
 	/* Check if the terraforming is valid wrt. tunnels, bridges and objects on the surface */
 	{
-		int count;
 		TileIndex *ti = ts.tile_table;
-		for (count = ts.tile_table_count; count != 0; count--, ti++) {
+		for (int count = ts.tile_table_count; count != 0; count--, ti++) {
 			TileIndex tile = *ti;
 			/* Find new heights of tile corners */
 			uint z_N = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 0));
 			uint z_W = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 0));
 			/* Find min and max height of tile */
 			uint z_min = min(min(z_N, z_W), min(z_S, z_E));
 			uint z_max = max(max(z_N, z_W), max(z_S, z_E));
 			/* Compute tile slope */
-			uint tileh = (z_max > z_min + 1 ? SLOPE_STEEP : SLOPE_FLAT);
+			Slope tileh = (z_max > z_min + 1 ? SLOPE_STEEP : SLOPE_FLAT);
-			if (z_W > z_min) tileh += SLOPE_W;
+			if (z_W > z_min) tileh |= SLOPE_W;
-			if (z_S > z_min) tileh += SLOPE_S;
+			if (z_S > z_min) tileh |= SLOPE_S;
-			if (z_E > z_min) tileh += SLOPE_E;
+			if (z_E > z_min) tileh |= SLOPE_E;
-			if (z_N > z_min) tileh += SLOPE_N;
+			if (z_N > z_min) tileh |= SLOPE_N;
 			/* Check if bridge would take damage */
 			if (direction == 1 && MayHaveBridgeAbove(tile) && IsBridgeAbove(tile) &&
 					GetBridgeHeight(GetSouthernBridgeEnd(tile)) <= z_max * TILE_HEIGHT) {
 				_terraform_err_tile = tile; // highlight the tile under the bridge
 			if (direction == -1 && IsTunnelInWay(tile, z_min * TILE_HEIGHT)) {
 				_terraform_err_tile = tile; // highlight the tile above the tunnel
 				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 | DC_AUTO, z_min * TILE_HEIGHT, (Slope) tileh);
+			CommandCost cost = _tile_type_procs[GetTileType(tile)]->terraform_tile_proc(tile, flags | DC_AUTO, z_min * TILE_HEIGHT, tileh);
 			if (CmdFailed(cost)) {
 				_terraform_err_tile = tile;
 				return cost;
 			}
 			total_cost.AddCost(cost);
 * @param p2 height difference; eg raise (+1), lower (-1) or level (0)
 * @return  error or cost of terraforming
 */
 CommandCost CmdLevelLand(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
-	int size_x, size_y;
-	int ex;
-	int ey;
-	int sx, sy;
-	uint h, oldh, curh;
-	CommandCost money;
-	CommandCost ret;
-	CommandCost cost(EXPENSES_CONSTRUCTION);
 	if (p1 >= MapSize()) return CMD_ERROR;
 	/* remember level height */
-	oldh = TileHeight(p1);
+	uint oldh = TileHeight(p1);
 	/* compute new height */
-	h = oldh + p2;
+	uint h = oldh + p2;
 	/* Check range of destination height */
 	if (h > MAX_TILE_HEIGHT) return_cmd_error((oldh == 0) ? STR_1003_ALREADY_AT_SEA_LEVEL : STR_1004_TOO_HIGH);
 	/* make sure sx,sy are smaller than ex,ey */
-	ex = TileX(tile);
+	int ex = TileX(tile);
-	ey = TileY(tile);
+	int ey = TileY(tile);
-	sx = TileX(p1);
+	int sx = TileX(p1);
-	sy = TileY(p1);
+	int sy = TileY(p1);
 	if (ex < sx) Swap(ex, sx);
 	if (ey < sy) Swap(ey, sy);
 	tile = TileXY(sx, sy);
-	size_x = ex - sx + 1;
+	int size_x = ex - sx + 1;
-	size_y = ey - sy + 1;
+	int size_y = ey - sy + 1;
-	money.AddCost(GetAvailableMoneyForCommand());
+	Money money = GetAvailableMoneyForCommand();
+	CommandCost cost(EXPENSES_CONSTRUCTION);
 	BEGIN_TILE_LOOP(tile2, size_x, size_y, tile) {
-		curh = TileHeight(tile2);
+		uint curh = TileHeight(tile2);
 		while (curh != h) {
-			ret = DoCommand(tile2, SLOPE_N, (curh > h) ? 0 : 1, flags & ~DC_EXEC, CMD_TERRAFORM_LAND);
+			CommandCost ret = DoCommand(tile2, SLOPE_N, (curh > h) ? 0 : 1, flags & ~DC_EXEC, CMD_TERRAFORM_LAND);
 			if (CmdFailed(ret)) break;
 			if (flags & DC_EXEC) {
-				money.AddCost(-ret.GetCost());
+				money -= ret.GetCost();
-				if (money.GetCost() < 0) {
+				if (money < 0) {
 					_additional_cash_required = ret.GetCost();
 					return cost;
 				}
 				DoCommand(tile2, SLOPE_N, (curh > h) ? 0 : 1, flags, CMD_TERRAFORM_LAND);
 			}

branch	NewGRF_ports
changeset 10184	fcf5fb2548eb
parent 6872	1c4a4a609f85
child 10731	67db0d431d5e