openttd-mini: comparison town

equal deleted inserted replaced

-:26da0c860a64
+:a36cc46e754d
 	}
 	z = ti->z;
 	/* Add bricks below the house? */
-	if (ti->tileh) {
+	if (ti->tileh != SLOPE_FLAT) {
 		AddSortableSpriteToDraw(SPR_FOUNDATION_BASE + ti->tileh, ti->x, ti->y, 16, 16, 7, z);
 		AddChildSpriteScreen(dcts->sprite_1, 31, 1);
 		z += 8;
 	} else {
 		/* Else draw regular ground */
 	}
 }
 static uint GetSlopeZ_Town(const TileInfo* ti)
 {
-	return ti->z + (ti->tileh == 0 ? 0 : 8);
+	return ti->z + (ti->tileh == SLOPE_FLAT ? 0 : 8);
 }
-static uint GetSlopeTileh_Town(TileIndex tile, uint tileh)
+static Slope GetSlopeTileh_Town(TileIndex tile, Slope tileh)
 {
-	return 0;
+	return SLOPE_FLAT;
 }
 static void AnimateTile_Town(TileIndex tile)
 {
 	int pos, dest;
 	return r;
 }
 static bool IsRoadAllowedHere(TileIndex tile, int dir)
 {
-	uint k;
+	Slope k;
-	uint slope;
+	Slope slope;
 	// If this assertion fails, it might be because the world contains
 	//  land at the edges. This is not ok.
 	TILE_ASSERT(tile);
 					CmdFailed(DoCommand(tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR)))
 				return false;
 		}
 		slope = GetTileSlope(tile, NULL);
-		if (slope == 0) {
+		if (slope == SLOPE_FLAT) {
 no_slope:
 			// Tile has no slope
 			// Disallow the road if any neighboring tile has a road.
 			if (HASBIT(GetTownRoadMask(TILE_ADD(tile, ToTileIndexDiff(_roadblock_tileadd[dir+1]))), dir^2) ||
 					HASBIT(GetTownRoadMask(TILE_ADD(tile, ToTileIndexDiff(_roadblock_tileadd[dir+3]))), dir^2) ||
 			return true;
 		}
 		// If the tile is not a slope in the right direction, then
 		// maybe terraform some.
-		if ((k = (dir&1)?0xC:0x9) != slope && (k^0xF) != slope) {
+		k = (dir & 1) ? SLOPE_NE : SLOPE_NW;
+		if (k != slope && ComplementSlope(k) != slope) {
 			uint32 r = Random();
 			if (CHANCE16I(1, 8, r) && !_generating_world) {
 				int32 res;
 				if (CHANCE16I(1, 16, r)) {
 					res = DoCommand(tile, slope, 0, DC_EXEC | DC_AUTO | DC_NO_WATER,
 					                      CMD_TERRAFORM_LAND);
 				} else {
-					res = DoCommand(tile, slope ^ 0xF, 1, DC_EXEC | DC_AUTO | DC_NO_WATER,
+					res = DoCommand(tile, ComplementSlope(slope), 1, DC_EXEC | DC_AUTO | DC_NO_WATER,
 					                      CMD_TERRAFORM_LAND);
 				}
 				if (CmdFailed(res) && CHANCE16I(1, 3, r)) {
 					// We can consider building on the slope, though.
 					goto no_slope;
 	return true;
 }
 static void LevelTownLand(TileIndex tile)
 {
-	uint tileh;
+	Slope tileh;
 	TILE_ASSERT(tile);
 	// Don't terraform if land is plain or if there's a house there.
 	if (IsTileType(tile, MP_HOUSE)) return;
 	tileh = GetTileSlope(tile, NULL);
-	if (tileh == 0) return;
+	if (tileh == SLOPE_FLAT) return;
 	// First try up, then down
 	if (!TerraformTownTile(tile, ~tileh & 0xF, 1)) {
 		TerraformTownTile(tile, tileh & 0xF, 0);
 	}
 	if (IsClearWaterTile(tile)) return;
 	// Determine direction of slope,
 	//  and build a road if not a special slope.
 	switch (GetTileSlope(tile, NULL)) {
-		case  3: i = DIAGDIR_NE; break;
+		case SLOPE_SW: i = DIAGDIR_NE; break;
-		case  6: i = DIAGDIR_NW; break;
+		case SLOPE_SE: i = DIAGDIR_NW; break;
-		case  9: i = DIAGDIR_SE; break;
+		case SLOPE_NW: i = DIAGDIR_SE; break;
-		case 12: i = DIAGDIR_SW; break;
+		case SLOPE_NE: i = DIAGDIR_SW; break;
 		default:
 build_road_and_exit:
 			if (!CmdFailed(DoCommand(tile, rcmd, t1->index, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD))) {
 				_grow_town_result = -1;
 	// clearing some land and then building a road there.
 	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 with GetHouseConstructionTick=0
 		if ((!IsTileType(tile, MP_HOUSE) || GetHouseConstructionTick(tile) != 0) &&
-				GetTileSlope(tile, NULL) == 0) {
+				GetTileSlope(tile, NULL) == SLOPE_FLAT) {
 			if (!CmdFailed(DoCommand(tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR))) {
 				DoCommand(tile, GenRandomRoadBits(), t->index, DC_EXEC | DC_AUTO, CMD_BUILD_ROAD);
 				_current_player = old_player;
 				return true;
 			}
 	// Check if too close to the edge of map
 	if (DistanceFromEdge(tile) < 12)
 		return_cmd_error(STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP);
 	// Can only build on clear flat areas.
-	if (!IsTileType(tile, MP_CLEAR) || GetTileSlope(tile, NULL) != 0) {
+	if (!IsTileType(tile, MP_CLEAR) || GetTileSlope(tile, NULL) != SLOPE_FLAT) {
 		return_cmd_error(STR_0239_SITE_UNSUITABLE);
 	}
 	// Check distance to all other towns.
 	if (IsCloseToTown(tile, 20))
 		// Generate a tile index not too close from the edge
 		tile = RandomTile();
 		if (DistanceFromEdge(tile) < 20) continue;
 		// Make sure the tile is plain
-		if (!IsTileType(tile, MP_CLEAR) || GetTileSlope(tile, NULL) != 0) continue;
+		if (!IsTileType(tile, MP_CLEAR) || GetTileSlope(tile, NULL) != SLOPE_FLAT) continue;
 		// Check not too close to a town
 		if (IsCloseToTown(tile, 20)) continue;
 		// Get a unique name for the town.
 	}
 	return true;
 }
-static bool CheckBuildHouseMode(TileIndex tile, uint tileh, int mode)
+static bool CheckBuildHouseMode(TileIndex tile, Slope tileh, int mode)
 {
 	int b;
-	uint slope;
+	Slope slope;
 	static const byte _masks[8] = {
 		0xC,0x3,0x9,0x6,
 		0x3,0xC,0x6,0x9,
 	};
 	slope = GetTileSlope(tile, NULL);
-	if (slope & 0x10)
+	if (IsSteepSlope(slope)) return false;
-		return false;
 	b = 0;
-	if ((slope & 0xF && ~slope & _masks[mode])) b = ~b;
+	if ((slope != SLOPE_FLAT && ~slope & _masks[mode])) b = ~b;
-	if ((tileh & 0xF && ~tileh & _masks[mode+4])) b = ~b;
+	if ((tileh != SLOPE_FLAT && ~tileh & _masks[mode+4])) b = ~b;
 	if (b)
 		return false;
 	return !CmdFailed(DoCommand(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_LANDSCAPE_CLEAR));
 }
 	};
 	for (i = 0; i != 4; i++) {
 		tile += ToTileIndexDiff(_tile_add[i]);
-		if (GetTileSlope(tile, NULL)) return false;
+		if (GetTileSlope(tile, NULL) != SLOPE_FLAT) return false;
 		if (CmdFailed(DoCommand(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER | DC_FORCETEST, CMD_LANDSCAPE_CLEAR)))
 			return false;
 	}
 static void DoBuildTownHouse(Town *t, TileIndex tile)
 {
 	int i;
 	uint bitmask;
 	int house;
-	uint slope;
+	Slope slope;
 	uint z;
 	uint oneof = 0;
 	// Above snow?
 	slope = GetTileSlope(tile, &z);
 			}
 			if (HASBITS(t->flags12 , oneof)) continue;
 			// Make sure there is no slope?
-			if (_housetype_extra_flags[house] & 0x12 && slope) continue;
+			if (_housetype_extra_flags[house] & 0x12 && slope != SLOPE_FLAT) continue;
 			if (_housetype_extra_flags[house] & 0x10) {
 				if (CheckFree2x2Area(tile) ||
 						CheckFree2x2Area(tile += TileDiffXY(-1,  0)) ||
 						CheckFree2x2Area(tile += TileDiffXY( 0, -1)) ||
 {
 	int32 r;
 	// make sure it's possible
 	if (!EnsureNoVehicle(tile)) return false;
-	if (GetTileSlope(tile, NULL) & 0x10) return false;
+	if (IsSteepSlope(GetTileSlope(tile, NULL))) return false;
 	r = DoCommand(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_LANDSCAPE_CLEAR);
 	if (CmdFailed(r)) return false;
 	DoBuildTownHouse(t, tile);
 static bool DoBuildStatueOfCompany(TileIndex tile)
 {
 	PlayerID old;
 	int32 r;
-	if (GetTileSlope(tile, NULL) != 0) return false;
+	if (GetTileSlope(tile, NULL) != SLOPE_FLAT) return false;
 	if (!IsTileType(tile, MP_HOUSE) &&
 			!IsTileType(tile, MP_CLEAR) &&
 			!IsTileType(tile, MP_TREES)) {
 		return false;

changeset 3636	a36cc46e754d
parent 3585	43461f26b729
child 3639	c27c9e4fddbd