diff options
| author | michi_cc <michi_cc@openttd.org> | 2008-10-20 19:35:48 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2008-10-20 19:35:48 +0000 |
| commit | 9c6541c80bce7543453ed9c9972ce71060894377 (patch) | |
| tree | 5703d7774e7ee037106c7b152f4e493c4fdf9346 | |
| parent | c03d4d5f49770eabe21687c062931c27108bc361 (diff) | |
| download | openttd-9c6541c80bce7543453ed9c9972ce71060894377.tar.xz | |
(svn r14504) -Cleanup: Use the right variable type for tile offsets.
| -rw-r--r-- | src/ai/trolly/trolly.cpp | 6 | ||||
| -rw-r--r-- | src/town.h | 2 | ||||
| -rw-r--r-- | src/town_cmd.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp index 23a67011b..17918b2ca 100644 --- a/src/ai/trolly/trolly.cpp +++ b/src/ai/trolly/trolly.cpp @@ -1057,7 +1057,7 @@ static void AiNew_State_BuildPath(Company *c) 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 @@ static void AiNew_State_BuildPath(Company *c) 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 @@ static void AiNew_State_BuildPath(Company *c) 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 --git a/src/town.h b/src/town.h index eacb863ce..3e021756a 100644 --- a/src/town.h +++ b/src/town.h @@ -299,7 +299,7 @@ static inline HouseSpec *GetHouseSpecs(HouseID house_id) return &_house_specs[house_id]; } -TileIndex GetHouseNorthPart(HouseID &house); +TileIndexDiff GetHouseNorthPart(HouseID &house); /** * Check if a TownID is valid. diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 4b3d19364..e55781b99 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -2026,7 +2026,7 @@ static void DoClearTownHouseHelper(TileIndex tile, Town *t, HouseID house) * @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) { |