# HG changeset patch # User michi_cc # Date 1224531348 0 # Node ID eb8e4225dbc6f62e367dc93ae90e01c6016464e5 # Parent df4d17274ec6baaa753fa5d0318e1b54474ab3b2 (svn r14504) -Cleanup: Use the right variable type for tile offsets. diff -r df4d17274ec6 -r eb8e4225dbc6 src/ai/trolly/trolly.cpp --- a/src/ai/trolly/trolly.cpp Mon Oct 20 15:44:14 2008 +0000 +++ b/src/ai/trolly/trolly.cpp Mon Oct 20 19:35:48 2008 +0000 @@ -1057,7 +1057,7 @@ ret = AI_DoCommand(tile, DiagDirToRoadBits(ReverseDiagDir(dir1)), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD); if (CmdSucceeded(ret)) { - TileIndex offset = TileOffsByDiagDir(dir1); + TileIndexDiff offset = TileOffsByDiagDir(dir1); if (IsTileType(tile + offset, MP_CLEAR) || IsTileType(tile + offset, MP_TREES)) { ret = AI_DoCommand(tile + offset, AiNew_GetRoadDirection(tile, tile + offset, tile + offset + offset), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD); if (CmdSucceeded(ret)) { @@ -1069,7 +1069,7 @@ ret = AI_DoCommand(tile, DiagDirToRoadBits(ReverseDiagDir(dir2)), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD); if (CmdSucceeded(ret)) { - TileIndex offset = TileOffsByDiagDir(dir2); + TileIndexDiff offset = TileOffsByDiagDir(dir2); if (IsTileType(tile + offset, MP_CLEAR) || IsTileType(tile + offset, MP_TREES)) { ret = AI_DoCommand(tile + offset, AiNew_GetRoadDirection(tile, tile + offset, tile + offset + offset), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD); if (CmdSucceeded(ret)) { @@ -1081,7 +1081,7 @@ ret = AI_DoCommand(tile, DiagDirToRoadBits(dir3), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD); if (CmdSucceeded(ret)) { - TileIndex offset = TileOffsByDiagDir(dir3); + TileIndexDiff offset = TileOffsByDiagDir(dir3); if (IsTileType(tile + offset, MP_CLEAR) || IsTileType(tile + offset, MP_TREES)) { ret = AI_DoCommand(tile + offset, AiNew_GetRoadDirection(tile, tile + offset, tile + offset + offset), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD); if (CmdSucceeded(ret)) { diff -r df4d17274ec6 -r eb8e4225dbc6 src/town.h --- a/src/town.h Mon Oct 20 15:44:14 2008 +0000 +++ b/src/town.h Mon Oct 20 19:35:48 2008 +0000 @@ -299,7 +299,7 @@ return &_house_specs[house_id]; } -TileIndex GetHouseNorthPart(HouseID &house); +TileIndexDiff GetHouseNorthPart(HouseID &house); /** * Check if a TownID is valid. diff -r df4d17274ec6 -r eb8e4225dbc6 src/town_cmd.cpp --- a/src/town_cmd.cpp Mon Oct 20 15:44:14 2008 +0000 +++ b/src/town_cmd.cpp Mon Oct 20 19:35:48 2008 +0000 @@ -2026,7 +2026,7 @@ * @param house Is changed to the HouseID of the north tile of the same house * @return TileDiff from the tile of the given HouseID to the north tile */ -TileIndex GetHouseNorthPart(HouseID &house) +TileIndexDiff GetHouseNorthPart(HouseID &house) { if (house >= 3) { // house id 0,1,2 MUST be single tile houses, or this code breaks. if (GetHouseSpecs(house - 1)->building_flags & TILE_SIZE_2x1) {