Changeset - r20805:06eb3eae002c
[Not reviewed]
master
0 11 0
zuu - 11 years ago 2013-10-12 22:07:58
zuu@openttd.org
(svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro)
11 files changed with 51 insertions and 27 deletions:
0 comments (0 inline, 0 general)
src/clear_cmd.cpp
Show inline comments
 
@@ -249,8 +249,7 @@ static void TileLoop_Clear(TileIndex til
 
	/* If the tile is at any edge flood it to prevent maps without water. */
 
	if (_settings_game.construction.freeform_edges && DistanceFromEdge(tile) == 1) {
 
		int z;
 
		Slope slope = GetTileSlope(tile, &z);
 
		if (z == 0 && slope == SLOPE_FLAT) {
 
		if (IsTileFlat(tile, &z) && z == 0) {
 
			DoFloodTile(tile);
 
			MarkTileDirtyByTile(tile);
 
			return;
src/industry_cmd.cpp
Show inline comments
 
@@ -1386,7 +1386,7 @@ static CommandCost CheckIfIndustryTilesA
 

	
 
		if (gfx == GFX_WATERTILE_SPECIALCHECK) {
 
			if (!IsTileType(cur_tile, MP_WATER) ||
 
					GetTileSlope(cur_tile) != SLOPE_FLAT) {
 
					!IsTileFlat(cur_tile)) {
 
				return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
 
			}
 
		} else {
src/landscape.cpp
Show inline comments
 
@@ -937,8 +937,7 @@ static void CreateDesertOrRainForest()
 
static bool FindSpring(TileIndex tile, void *user_data)
 
{
 
	int referenceHeight;
 
	Slope s = GetTileSlope(tile, &referenceHeight);
 
	if (s != SLOPE_FLAT || IsWaterTile(tile)) return false;
 
	if (!IsTileFlat(tile, &referenceHeight) || IsWaterTile(tile)) return false;
 

	
 
	/* In the tropics rivers start in the rainforest. */
 
	if (_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) != TROPICZONE_RAINFOREST) return false;
 
@@ -974,7 +973,7 @@ static bool FindSpring(TileIndex tile, v
 
static bool MakeLake(TileIndex tile, void *user_data)
 
{
 
	uint height = *(uint*)user_data;
 
	if (!IsValidTile(tile) || TileHeight(tile) != height || GetTileSlope(tile) != SLOPE_FLAT) return false;
 
	if (!IsValidTile(tile) || TileHeight(tile) != height || !IsTileFlat(tile)) return false;
 
	if (_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) == TROPICZONE_DESERT) return false;
 

	
 
	for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) {
 
@@ -1123,7 +1122,7 @@ static bool FlowRiver(bool *marks, TileI
 
		queue.pop_front();
 

	
 
		uint height2 = TileHeight(end);
 
		if (GetTileSlope(end) == SLOPE_FLAT && (height2 < height || (height2 == height && IsWaterTile(end)))) {
 
		if (IsTileFlat(end) && (height2 < height || (height2 == height && IsWaterTile(end)))) {
 
			found = true;
 
			break;
 
		}
 
@@ -1150,7 +1149,7 @@ static bool FlowRiver(bool *marks, TileI
 

	
 
		if (IsValidTile(lakeCenter) &&
 
				/* A river, or lake, can only be built on flat slopes. */
 
				GetTileSlope(lakeCenter) == SLOPE_FLAT &&
 
				IsTileFlat(lakeCenter) &&
 
				/* We want the lake to be built at the height of the river. */
 
				TileHeight(begin) == TileHeight(lakeCenter) &&
 
				/* We don't want the lake at the entry of the valley. */
src/object_cmd.cpp
Show inline comments
 
@@ -303,7 +303,7 @@ CommandCost CmdBuildObject(TileIndex til
 
	switch (type) {
 
		case OBJECT_TRANSMITTER:
 
		case OBJECT_LIGHTHOUSE:
 
			if (GetTileSlope(tile) != SLOPE_FLAT) return_cmd_error(STR_ERROR_FLAT_LAND_REQUIRED);
 
			if (!IsTileFlat(tile)) return_cmd_error(STR_ERROR_FLAT_LAND_REQUIRED);
 
			break;
 

	
 
		case OBJECT_OWNED_LAND:
 
@@ -673,7 +673,7 @@ void GenerateObjects()
 
		TileIndex tile = RandomTile();
 

	
 
		int h;
 
		if (IsTileType(tile, MP_CLEAR) && GetTileSlope(tile, &h) == SLOPE_FLAT && h >= 4 && !IsBridgeAbove(tile)) {
 
		if (IsTileType(tile, MP_CLEAR) && IsTileFlat(tile, &h) && h >= 4 && !IsBridgeAbove(tile)) {
 
			TileIndex t = tile;
 
			if (CircularTileSearch(&t, 9, HasTransmitter, NULL)) continue;
 

	
 
@@ -710,7 +710,7 @@ void GenerateObjects()
 

	
 
		for (int j = 0; j < 19; j++) {
 
			int h;
 
			if (IsTileType(tile, MP_CLEAR) && GetTileSlope(tile, &h) == SLOPE_FLAT && h <= 2 && !IsBridgeAbove(tile)) {
 
			if (IsTileType(tile, MP_CLEAR) && IsTileFlat(tile, &h) && h <= 2 && !IsBridgeAbove(tile)) {
 
				BuildObject(OBJECT_LIGHTHOUSE, tile);
 
				IncreaseGeneratingWorldProgress(GWP_OBJECT);
 
				lighthouses_to_build--;
src/saveload/afterload.cpp
Show inline comments
 
@@ -74,7 +74,7 @@ void SetWaterClassDependingOnSurrounding
 
{
 
	/* If the slope is not flat, we always assume 'land' (if allowed). Also for one-corner-raised-shores.
 
	 * Note: Wrt. autosloping under industry tiles this is the most fool-proof behaviour. */
 
	if (GetTileSlope(t) != SLOPE_FLAT) {
 
	if (!IsTileFlat(t)) {
 
		if (include_invalid_water_class) {
 
			SetWaterClass(t, WATER_CLASS_INVALID);
 
			return;
 
@@ -1106,7 +1106,7 @@ bool AfterLoadGame()
 
						if (GB(_m[t].m5, 3, 2) == 0) {
 
							MakeClear(t, CLEAR_GRASS, 3);
 
						} else {
 
							if (GetTileSlope(t) != SLOPE_FLAT) {
 
							if (!IsTileFlat(t)) {
 
								MakeShore(t);
 
							} else {
 
								if (GetTileOwner(t) == OWNER_WATER) {
 
@@ -1712,7 +1712,7 @@ bool AfterLoadGame()
 
		 * on its neighbouring tiles. Done after river and canal updates to
 
		 * ensure neighbours are correct. */
 
		for (TileIndex t = 0; t < map_size; t++) {
 
			if (GetTileSlope(t) != SLOPE_FLAT) continue;
 
			if (!IsTileFlat(t)) continue;
 

	
 
			if (IsTileType(t, MP_WATER) && IsLock(t)) SetWaterClassDependingOnSurroundings(t, false);
 
			if (IsTileType(t, MP_STATION) && (IsDock(t) || IsBuoy(t))) SetWaterClassDependingOnSurroundings(t, false);
 
@@ -2390,7 +2390,7 @@ bool AfterLoadGame()
 
	if (IsSavegameVersionBefore(149)) {
 
		for (TileIndex t = 0; t < map_size; t++) {
 
			if (!IsTileType(t, MP_STATION)) continue;
 
			if (!IsBuoy(t) && !IsOilRig(t) && !(IsDock(t) && GetTileSlope(t) == SLOPE_FLAT)) {
 
			if (!IsBuoy(t) && !IsOilRig(t) && !(IsDock(t) && IsTileFlat(t))) {
 
				SetWaterClass(t, WATER_CLASS_INVALID);
 
			}
 
		}
src/station_cmd.cpp
Show inline comments
 
@@ -2471,7 +2471,7 @@ CommandCost CmdBuildDock(TileIndex tile,
 

	
 
	TileIndex tile_cur = tile + TileOffsByDiagDir(direction);
 

	
 
	if (!IsTileType(tile_cur, MP_WATER) || GetTileSlope(tile_cur) != SLOPE_FLAT) {
 
	if (!IsTileType(tile_cur, MP_WATER) || !IsTileFlat(tile_cur)) {
 
		return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
 
	}
 

	
 
@@ -2484,7 +2484,7 @@ CommandCost CmdBuildDock(TileIndex tile,
 
	if (ret.Failed()) return ret;
 

	
 
	tile_cur += TileOffsByDiagDir(direction);
 
	if (!IsTileType(tile_cur, MP_WATER) || GetTileSlope(tile_cur) != SLOPE_FLAT) {
 
	if (!IsTileType(tile_cur, MP_WATER) || !IsTileFlat(tile_cur)) {
 
		return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
 
	}
 

	
 
@@ -3069,7 +3069,7 @@ static void TileLoop_Station(TileIndex t
 
			break;
 

	
 
		case STATION_DOCK:
 
			if (GetTileSlope(tile) != SLOPE_FLAT) break; // only handle water part
 
			if (!IsTileFlat(tile)) break; // only handle water part
 
			/* FALL THROUGH */
 
		case STATION_OILRIG: //(station part)
 
		case STATION_BUOY:
src/tile_map.cpp
Show inline comments
 
@@ -59,6 +59,30 @@ Slope GetTileSlope(TileIndex tile, int *
 
}
 

	
 
/**
 
 * Check if a given tile is flat
 
 * @param tile Tile to check
 
 * @param h If not \c NULL, pointer to storage of z height (only if tile is flat)
 
 * @return Whether the tile is flat
 
 */
 
bool IsTileFlat(TileIndex tile, int *h)
 
{
 
	assert(tile < MapSize());
 

	
 
	if (!IsInnerTile(tile)) {
 
		if (h != NULL) *h = TileHeight(tile);
 
		return true;
 
	}
 

	
 
	uint z = TileHeight(tile);
 
	if (TileHeight(tile + TileDiffXY(1, 0)) != z) return false;
 
	if (TileHeight(tile + TileDiffXY(0, 1)) != z) return false;
 
	if (TileHeight(tile + TileDiffXY(1, 1)) != z) return false;
 

	
 
	if (h != NULL) *h = z;
 
	return true;
 
}
 

	
 
/**
 
 * Get bottom height of the tile
 
 * @param tile Tile to compute height of
 
 * @return Minimum height of the tile
src/tile_map.h
Show inline comments
 
@@ -247,6 +247,8 @@ Slope GetTileSlope(TileIndex tile, int *
 
int GetTileZ(TileIndex tile);
 
int GetTileMaxZ(TileIndex tile);
 

	
 
bool IsTileFlat(TileIndex tile, int *h = NULL);
 

	
 
/**
 
 * Return the slope of a given tile
 
 * @param tile Tile to compute slope of
src/town_cmd.cpp
Show inline comments
 
@@ -1411,7 +1411,7 @@ static bool GrowTown(Town *t)
 
		tile = t->xy;
 
		for (ptr = _town_coord_mod; ptr != endof(_town_coord_mod); ++ptr) {
 
			/* Only work with plain land that not already has a house */
 
			if (!IsTileType(tile, MP_HOUSE) && GetTileSlope(tile) == SLOPE_FLAT) {
 
			if (!IsTileType(tile, MP_HOUSE) && IsTileFlat(tile)) {
 
				if (DoCommand(tile, 0, 0, DC_AUTO | DC_NO_WATER, CMD_LANDSCAPE_CLEAR).Succeeded()) {
 
					DoCommand(tile, GenRandomRoadBits(), t->index, DC_EXEC | DC_AUTO, CMD_BUILD_ROAD);
 
					cur_company.Restore();
 
@@ -1574,7 +1574,7 @@ static CommandCost TownCanBePlacedHere(T
 
	}
 

	
 
	/* Can only build on clear flat areas, possibly with trees. */
 
	if ((!IsTileType(tile, MP_CLEAR) && !IsTileType(tile, MP_TREES)) || GetTileSlope(tile) != SLOPE_FLAT) {
 
	if ((!IsTileType(tile, MP_CLEAR) && !IsTileType(tile, MP_TREES)) || !IsTileFlat(tile)) {
 
		return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
 
	}
 

	
 
@@ -1775,7 +1775,7 @@ static bool FindFurthestFromWater(TileIn
 
	uint dist = GetClosestWaterDistance(tile, true);
 

	
 
	if (IsTileType(tile, MP_CLEAR) &&
 
			GetTileSlope(tile) == SLOPE_FLAT &&
 
			IsTileFlat(tile) &&
 
			IsTileAlignedToGrid(tile, sp->layout) &&
 
			dist > sp->max_dist) {
 
		sp->tile = tile;
src/water_cmd.cpp
Show inline comments
 
@@ -110,7 +110,7 @@ CommandCost CmdBuildShipDepot(TileIndex 
 
	if ((MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) ||
 
		(MayHaveBridgeAbove(tile2) && IsBridgeAbove(tile2))) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);
 

	
 
	if (GetTileSlope(tile) != SLOPE_FLAT || GetTileSlope(tile2) != SLOPE_FLAT) {
 
	if (!IsTileFlat(tile) || !IsTileFlat(tile2)) {
 
		/* Prevent depots on rapids */
 
		return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
 
	}
 
@@ -270,7 +270,7 @@ static CommandCost DoBuildLock(TileIndex
 
		cost.AddCost(ret);
 
		cost.AddCost(_price[PR_BUILD_CANAL]);
 
	}
 
	if (GetTileSlope(tile - delta) != SLOPE_FLAT) {
 
	if (!IsTileFlat(tile - delta)) {
 
		return_cmd_error(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
 
	}
 

	
 
@@ -283,7 +283,7 @@ static CommandCost DoBuildLock(TileIndex
 
		cost.AddCost(ret);
 
		cost.AddCost(_price[PR_BUILD_CANAL]);
 
	}
 
	if (GetTileSlope(tile + delta) != SLOPE_FLAT) {
 
	if (!IsTileFlat(tile + delta)) {
 
		return_cmd_error(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
 
	}
 

	
 
@@ -590,7 +590,7 @@ bool IsWateredTile(TileIndex tile, Direc
 

	
 
				return IsTileOnWater(tile);
 
			}
 
			return (IsDock(tile) && GetTileSlope(tile) == SLOPE_FLAT) || IsBuoy(tile);
 
			return (IsDock(tile) && IsTileFlat(tile)) || IsBuoy(tile);
 

	
 
		case MP_INDUSTRY: {
 
			/* Do not draw waterborders inside of industries.
 
@@ -1240,7 +1240,7 @@ static TrackStatus GetTileTrackStatus_Wa
 
	if (mode != TRANSPORT_WATER) return 0;
 

	
 
	switch (GetWaterTileType(tile)) {
 
		case WATER_TILE_CLEAR: ts = (GetTileSlope(tile) == SLOPE_FLAT) ? TRACK_BIT_ALL : TRACK_BIT_NONE; break;
 
		case WATER_TILE_CLEAR: ts = IsTileFlat(tile) ? TRACK_BIT_ALL : TRACK_BIT_NONE; break;
 
		case WATER_TILE_COAST: ts = (TrackBits)coast_tracks[GetTileSlope(tile) & 0xF]; break;
 
		case WATER_TILE_LOCK:  ts = DiagDirToDiagTrackBits(GetLockDirection(tile)); break;
 
		case WATER_TILE_DEPOT: ts = AxisToTrackBits(GetShipDepotAxis(tile)); break;
src/waypoint_cmd.cpp
Show inline comments
 
@@ -289,7 +289,7 @@ CommandCost CmdBuildBuoy(TileIndex tile,
 
	if (tile == 0 || !HasTileWaterGround(tile)) return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
 
	if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);
 

	
 
	if (GetTileSlope(tile) != SLOPE_FLAT) return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
 
	if (!IsTileFlat(tile)) return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
 

	
 
	/* Check if there is an already existing, deleted, waypoint close to us that we can reuse. */
 
	Waypoint *wp = FindDeletedWaypointCloseTo(tile, STR_SV_STNAME_BUOY, OWNER_NONE);
0 comments (0 inline, 0 general)