mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: rename TILE_ADD(XY) to TileAdd(XY)

This commit is contained in:
Rubidium 2024-03-10 14:51:08 +01:00 committed by rubidium42
parent df461b0329
commit 27eadc13ec
22 changed files with 77 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/clear_cmd.cpp
View File

@ -144,25 +144,25 @@ static void UpdateFences(TileIndex tile)
assert(IsTileType(tile, MP_CLEAR) && IsClearGround(tile, CLEAR_FIELDS)); assert(IsTileType(tile, MP_CLEAR) && IsClearGround(tile, CLEAR_FIELDS));
bool dirty = false; bool dirty = false;
bool neighbour = (IsTileType(TILE_ADDXY(tile, 1, 0), MP_CLEAR) && IsClearGround(TILE_ADDXY(tile, 1, 0), CLEAR_FIELDS)); bool neighbour = (IsTileType(TileAddXY(tile, 1, 0), MP_CLEAR) && IsClearGround(TileAddXY(tile, 1, 0), CLEAR_FIELDS));
if (!neighbour && GetFence(tile, DIAGDIR_SW) == 0) { if (!neighbour && GetFence(tile, DIAGDIR_SW) == 0) {
SetFence(tile, DIAGDIR_SW, 3); SetFence(tile, DIAGDIR_SW, 3);
dirty = true; dirty = true;
} }
neighbour = (IsTileType(TILE_ADDXY(tile, 0, 1), MP_CLEAR) && IsClearGround(TILE_ADDXY(tile, 0, 1), CLEAR_FIELDS)); neighbour = (IsTileType(TileAddXY(tile, 0, 1), MP_CLEAR) && IsClearGround(TileAddXY(tile, 0, 1), CLEAR_FIELDS));
if (!neighbour && GetFence(tile, DIAGDIR_SE) == 0) { if (!neighbour && GetFence(tile, DIAGDIR_SE) == 0) {
SetFence(tile, DIAGDIR_SE, 3); SetFence(tile, DIAGDIR_SE, 3);
dirty = true; dirty = true;
} }
neighbour = (IsTileType(TILE_ADDXY(tile, -1, 0), MP_CLEAR) && IsClearGround(TILE_ADDXY(tile, -1, 0), CLEAR_FIELDS)); neighbour = (IsTileType(TileAddXY(tile, -1, 0), MP_CLEAR) && IsClearGround(TileAddXY(tile, -1, 0), CLEAR_FIELDS));
if (!neighbour && GetFence(tile, DIAGDIR_NE) == 0) { if (!neighbour && GetFence(tile, DIAGDIR_NE) == 0) {
SetFence(tile, DIAGDIR_NE, 3); SetFence(tile, DIAGDIR_NE, 3);
dirty = true; dirty = true;
} }
neighbour = (IsTileType(TILE_ADDXY(tile, 0, -1), MP_CLEAR) && IsClearGround(TILE_ADDXY(tile, 0, -1), CLEAR_FIELDS)); neighbour = (IsTileType(TileAddXY(tile, 0, -1), MP_CLEAR) && IsClearGround(TileAddXY(tile, 0, -1), CLEAR_FIELDS));
if (!neighbour && GetFence(tile, DIAGDIR_NW) == 0) { if (!neighbour && GetFence(tile, DIAGDIR_NW) == 0) {
SetFence(tile, DIAGDIR_NW, 3); SetFence(tile, DIAGDIR_NW, 3);
dirty = true; dirty = true;

4
src/dock_gui.cpp
View File

@ -74,7 +74,7 @@ static TileIndex GetOtherAqueductEnd(TileIndex tile_from, TileIndex *tile_to = n
* complains about the wrong slope instead of the ends not matching up. * complains about the wrong slope instead of the ends not matching up.
* Make sure the coordinate is always a valid tile within the map, so we * Make sure the coordinate is always a valid tile within the map, so we
* don't go "off" the map. That would cause the wrong error message. */ * don't go "off" the map. That would cause the wrong error message. */
if (!IsValidDiagDirection(dir)) return TILE_ADDXY(tile_from, TileX(tile_from) > 2 ? -1 : 1, 0); if (!IsValidDiagDirection(dir)) return TileAddXY(tile_from, TileX(tile_from) > 2 ? -1 : 1, 0);
/* Direction the aqueduct is built to. */ /* Direction the aqueduct is built to. */
TileIndexDiff offset = TileOffsByDiagDir(ReverseDiagDir(dir)); TileIndexDiff offset = TileOffsByDiagDir(ReverseDiagDir(dir));
@ -83,7 +83,7 @@ static TileIndex GetOtherAqueductEnd(TileIndex tile_from, TileIndex *tile_to = n
TileIndex endtile = tile_from; TileIndex endtile = tile_from;
for (int length = 0; IsValidTile(endtile) && TileX(endtile) != 0 && TileY(endtile) != 0; length++) { for (int length = 0; IsValidTile(endtile) && TileX(endtile) != 0 && TileY(endtile) != 0; length++) {
endtile = TILE_ADD(endtile, offset); endtile = TileAdd(endtile, offset);
if (length > max_length) break; if (length > max_length) break;

4
src/industry_cmd.cpp
View File

@ -1307,7 +1307,7 @@ static CommandCost CheckNewIndustry_OilRefinery(TileIndex tile)
{ {
if (_game_mode == GM_EDITOR) return CommandCost(); if (_game_mode == GM_EDITOR) return CommandCost();
if (CheckScaledDistanceFromEdge(TILE_ADDXY(tile, 1, 1), _settings_game.game_creation.oil_refinery_limit)) return CommandCost(); if (CheckScaledDistanceFromEdge(TileAddXY(tile, 1, 1), _settings_game.game_creation.oil_refinery_limit)) return CommandCost();
return_cmd_error(STR_ERROR_CAN_ONLY_BE_POSITIONED); return_cmd_error(STR_ERROR_CAN_ONLY_BE_POSITIONED);
} }
@ -1324,7 +1324,7 @@ static CommandCost CheckNewIndustry_OilRig(TileIndex tile)
if (_game_mode == GM_EDITOR && _ignore_restrictions) return CommandCost(); if (_game_mode == GM_EDITOR && _ignore_restrictions) return CommandCost();
if (TileHeight(tile) == 0 && if (TileHeight(tile) == 0 &&
CheckScaledDistanceFromEdge(TILE_ADDXY(tile, 1, 1), _settings_game.game_creation.oil_refinery_limit)) return CommandCost(); CheckScaledDistanceFromEdge(TileAddXY(tile, 1, 1), _settings_game.game_creation.oil_refinery_limit)) return CommandCost();
return_cmd_error(STR_ERROR_CAN_ONLY_BE_POSITIONED); return_cmd_error(STR_ERROR_CAN_ONLY_BE_POSITIONED);
} }

4
src/landscape.cpp
View File

@ -390,7 +390,7 @@ bool HasFoundationNW(TileIndex tile, Slope slope_here, uint z_here)
int z_N_here = z_here; int z_N_here = z_here;
GetSlopePixelZOnEdge(slope_here, DIAGDIR_NW, z_W_here, z_N_here); GetSlopePixelZOnEdge(slope_here, DIAGDIR_NW, z_W_here, z_N_here);
auto [slope, z] = GetFoundationPixelSlope(TILE_ADDXY(tile, 0, -1)); auto [slope, z] = GetFoundationPixelSlope(TileAddXY(tile, 0, -1));
int z_W = z; int z_W = z;
int z_N = z; int z_N = z;
GetSlopePixelZOnEdge(slope, DIAGDIR_SE, z_W, z_N); GetSlopePixelZOnEdge(slope, DIAGDIR_SE, z_W, z_N);
@ -405,7 +405,7 @@ bool HasFoundationNE(TileIndex tile, Slope slope_here, uint z_here)
int z_N_here = z_here; int z_N_here = z_here;
GetSlopePixelZOnEdge(slope_here, DIAGDIR_NE, z_E_here, z_N_here); GetSlopePixelZOnEdge(slope_here, DIAGDIR_NE, z_E_here, z_N_here);
auto [slope, z] = GetFoundationPixelSlope(TILE_ADDXY(tile, -1, 0)); auto [slope, z] = GetFoundationPixelSlope(TileAddXY(tile, -1, 0));
int z_E = z; int z_E = z;
int z_N = z; int z_N = z;
GetSlopePixelZOnEdge(slope, DIAGDIR_SW, z_E, z_N); GetSlopePixelZOnEdge(slope, DIAGDIR_SW, z_E, z_N);

9
src/map_func.h
View File

@ -463,10 +463,9 @@ inline TileIndexDiff ToTileIndexDiff(TileIndexDiffC tidc)
* @param y Another tile to add * @param y Another tile to add
* @return The resulting tile(index) * @return The resulting tile(index)
*/ */
# define TILE_ADD(x, y) ((x) + (y)) # define TileAdd(x, y) ((x) + (y))
#else #else
extern TileIndex TileAdd(TileIndex tile, TileIndexDiff offset); extern TileIndex TileAdd(TileIndex tile, TileIndexDiff offset);
# define TILE_ADD(x, y) (TileAdd((x), (y))
#endif #endif
/** /**
@ -476,7 +475,7 @@ inline TileIndexDiff ToTileIndexDiff(TileIndexDiffC tidc)
* @param x The x offset to add to the tile * @param x The x offset to add to the tile
* @param y The y offset to add to the tile * @param y The y offset to add to the tile
*/ */
#define TILE_ADDXY(tile, x, y) TILE_ADD(tile, TileDiffXY(x, y)) #define TileAddXY(tile, x, y) TileAdd(tile, TileDiffXY(x, y))
TileIndex TileAddWrap(TileIndex tile, int addx, int addy); TileIndex TileAddWrap(TileIndex tile, int addx, int addy);
@ -590,7 +589,7 @@ inline TileIndexDiff TileOffsByDir(Direction dir)
*/ */
inline TileIndex TileAddByDir(TileIndex tile, Direction dir) inline TileIndex TileAddByDir(TileIndex tile, Direction dir)
{ {
return TILE_ADD(tile, TileOffsByDir(dir)); return TileAdd(tile, TileOffsByDir(dir));
} }
/** /**
@ -602,7 +601,7 @@ inline TileIndex TileAddByDir(TileIndex tile, Direction dir)
*/ */
inline TileIndex TileAddByDiagDir(TileIndex tile, DiagDirection dir) inline TileIndex TileAddByDiagDir(TileIndex tile, DiagDirection dir)
{ {
return TILE_ADD(tile, TileOffsByDiagDir(dir)); return TileAdd(tile, TileOffsByDiagDir(dir));
} }
/** /**

16
src/newgrf_canal.cpp
View File

@ -85,14 +85,14 @@ struct CanalResolverObject : public ResolverObject {
*/ */
case 0x82: { case 0x82: {
uint32_t connectivity = uint32_t connectivity =
(!IsWateredTile(TILE_ADDXY(tile, -1, 0), DIR_SW) << 0) // NE (!IsWateredTile(TileAddXY(tile, -1, 0), DIR_SW) << 0) // NE
+ (!IsWateredTile(TILE_ADDXY(tile, 0, 1), DIR_NW) << 1) // SE + (!IsWateredTile(TileAddXY(tile, 0, 1), DIR_NW) << 1) // SE
+ (!IsWateredTile(TILE_ADDXY(tile, 1, 0), DIR_NE) << 2) // SW + (!IsWateredTile(TileAddXY(tile, 1, 0), DIR_NE) << 2) // SW
+ (!IsWateredTile(TILE_ADDXY(tile, 0, -1), DIR_SE) << 3) // NW + (!IsWateredTile(TileAddXY(tile, 0, -1), DIR_SE) << 3) // NW
+ (!IsWateredTile(TILE_ADDXY(tile, -1, 1), DIR_W) << 4) // E + (!IsWateredTile(TileAddXY(tile, -1, 1), DIR_W) << 4) // E
+ (!IsWateredTile(TILE_ADDXY(tile, 1, 1), DIR_N) << 5) // S + (!IsWateredTile(TileAddXY(tile, 1, 1), DIR_N) << 5) // S
+ (!IsWateredTile(TILE_ADDXY(tile, 1, -1), DIR_E) << 6) // W + (!IsWateredTile(TileAddXY(tile, 1, -1), DIR_E) << 6) // W
+ (!IsWateredTile(TILE_ADDXY(tile, -1, -1), DIR_S) << 7); // N + (!IsWateredTile(TileAddXY(tile, -1, -1), DIR_S) << 7); // N
return connectivity; return connectivity;
} }

18
src/newgrf_house.cpp
View File

@ -558,9 +558,9 @@ bool NewHouseTileLoop(TileIndex tile)
uint16_t random = GB(Random(), 0, 16); uint16_t random = GB(Random(), 0, 16);
if (hs->building_flags & BUILDING_HAS_1_TILE) AnimationControl(tile, random); if (hs->building_flags & BUILDING_HAS_1_TILE) AnimationControl(tile, random);
if (hs->building_flags & BUILDING_2_TILES_Y) AnimationControl(TILE_ADDXY(tile, 0, 1), random); if (hs->building_flags & BUILDING_2_TILES_Y) AnimationControl(TileAddXY(tile, 0, 1), random);
if (hs->building_flags & BUILDING_2_TILES_X) AnimationControl(TILE_ADDXY(tile, 1, 0), random); if (hs->building_flags & BUILDING_2_TILES_X) AnimationControl(TileAddXY(tile, 1, 0), random);
if (hs->building_flags & BUILDING_HAS_4_TILES) AnimationControl(TILE_ADDXY(tile, 1, 1), random); if (hs->building_flags & BUILDING_HAS_4_TILES) AnimationControl(TileAddXY(tile, 1, 1), random);
} else { } else {
AnimationControl(tile, 0); AnimationControl(tile, 0);
} }
@ -620,9 +620,9 @@ static void DoTriggerHouse(TileIndex tile, HouseTrigger trigger, byte base_rando
break; break;
} }
/* Random value of first tile already set. */ /* Random value of first tile already set. */
if (hs->building_flags & BUILDING_2_TILES_Y) DoTriggerHouse(TILE_ADDXY(tile, 0, 1), trigger, random_bits, false); if (hs->building_flags & BUILDING_2_TILES_Y) DoTriggerHouse(TileAddXY(tile, 0, 1), trigger, random_bits, false);
if (hs->building_flags & BUILDING_2_TILES_X) DoTriggerHouse(TILE_ADDXY(tile, 1, 0), trigger, random_bits, false); if (hs->building_flags & BUILDING_2_TILES_X) DoTriggerHouse(TileAddXY(tile, 1, 0), trigger, random_bits, false);
if (hs->building_flags & BUILDING_HAS_4_TILES) DoTriggerHouse(TILE_ADDXY(tile, 1, 1), trigger, random_bits, false); if (hs->building_flags & BUILDING_HAS_4_TILES) DoTriggerHouse(TileAddXY(tile, 1, 1), trigger, random_bits, false);
break; break;
} }
} }
@ -670,8 +670,8 @@ void WatchedCargoCallback(TileIndex tile, CargoTypes trigger_cargoes)
hs = HouseSpec::Get(id); hs = HouseSpec::Get(id);
DoWatchedCargoCallback(north, tile, trigger_cargoes, r); DoWatchedCargoCallback(north, tile, trigger_cargoes, r);
if (hs->building_flags & BUILDING_2_TILES_Y) DoWatchedCargoCallback(TILE_ADDXY(north, 0, 1), tile, trigger_cargoes, r); if (hs->building_flags & BUILDING_2_TILES_Y) DoWatchedCargoCallback(TileAddXY(north, 0, 1), tile, trigger_cargoes, r);
if (hs->building_flags & BUILDING_2_TILES_X) DoWatchedCargoCallback(TILE_ADDXY(north, 1, 0), tile, trigger_cargoes, r); if (hs->building_flags & BUILDING_2_TILES_X) DoWatchedCargoCallback(TileAddXY(north, 1, 0), tile, trigger_cargoes, r);
if (hs->building_flags & BUILDING_HAS_4_TILES) DoWatchedCargoCallback(TILE_ADDXY(north, 1, 1), tile, trigger_cargoes, r); if (hs->building_flags & BUILDING_HAS_4_TILES) DoWatchedCargoCallback(TileAddXY(north, 1, 1), tile, trigger_cargoes, r);
} }

2
src/newgrf_station.cpp
View File

@ -148,7 +148,7 @@ static TileIndex FindRailStationEnd(TileIndex tile, TileIndexDiff delta, bool ch
if (check_axis) orig_axis = GetRailStationAxis(tile); if (check_axis) orig_axis = GetRailStationAxis(tile);
for (;;) { for (;;) {
TileIndex new_tile = TILE_ADD(tile, delta); TileIndex new_tile = TileAdd(tile, delta);
if (!IsTileType(new_tile, MP_STATION) || GetStationIndex(new_tile) != sid) break; if (!IsTileType(new_tile, MP_STATION) || GetStationIndex(new_tile) != sid) break;
if (!HasStationRail(new_tile)) break; if (!HasStationRail(new_tile)) break;

2
src/pathfinder/follow_track.hpp
View File

@ -376,7 +376,7 @@ protected:
/* move to the platform end */ /* move to the platform end */
TileIndexDiff diff = TileOffsByDiagDir(m_exitdir); TileIndexDiff diff = TileOffsByDiagDir(m_exitdir);
diff *= m_tiles_skipped; diff *= m_tiles_skipped;
m_new_tile = TILE_ADD(m_new_tile, diff); m_new_tile = TileAdd(m_new_tile, diff);
return true; return true;
} }

2
src/pathfinder/npf/npf.cpp
View File

@ -658,7 +658,7 @@ static void NPFSaveTargetData(AyStar *as, OpenListNode *current)
if (IsRailStationTile(target->node.tile)) { if (IsRailStationTile(target->node.tile)) {
DiagDirection dir = TrackdirToExitdir(target->node.direction); DiagDirection dir = TrackdirToExitdir(target->node.direction);
uint len = Station::GetByTile(target->node.tile)->GetPlatformLength(target->node.tile, dir); uint len = Station::GetByTile(target->node.tile)->GetPlatformLength(target->node.tile, dir);
TileIndex end_tile = TILE_ADD(target->node.tile, (len - 1) * TileOffsByDiagDir(dir)); TileIndex end_tile = TileAdd(target->node.tile, (len - 1) * TileOffsByDiagDir(dir));
/* Update only end tile, trackdir of a station stays the same. */ /* Update only end tile, trackdir of a station stays the same. */
ftd->node.tile = end_tile; ftd->node.tile = end_tile;

4
src/pathfinder/yapf/yapf_rail.cpp
View File

@ -77,7 +77,7 @@ private:
if (HasStationReservation(tile)) return false; if (HasStationReservation(tile)) return false;
SetRailStationReservation(tile, true); SetRailStationReservation(tile, true);
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
tile = TILE_ADD(tile, diff); tile = TileAdd(tile, diff);
} while (IsCompatibleTrainStationTile(tile, start) && tile != m_origin_tile); } while (IsCompatibleTrainStationTile(tile, start) && tile != m_origin_tile);
TriggerStationRandomisation(nullptr, start, SRT_PATH_RESERVATION); TriggerStationRandomisation(nullptr, start, SRT_PATH_RESERVATION);
@ -114,7 +114,7 @@ private:
TileIndexDiff diff = TileOffsByDiagDir(TrackdirToExitdir(ReverseTrackdir(td))); TileIndexDiff diff = TileOffsByDiagDir(TrackdirToExitdir(ReverseTrackdir(td)));
while ((tile != m_res_fail_tile || td != m_res_fail_td) && IsCompatibleTrainStationTile(tile, start)) { while ((tile != m_res_fail_tile || td != m_res_fail_td) && IsCompatibleTrainStationTile(tile, start)) {
SetRailStationReservation(tile, false); SetRailStationReservation(tile, false);
tile = TILE_ADD(tile, diff); tile = TileAdd(tile, diff);
} }
} else if (tile != m_res_fail_tile || td != m_res_fail_td) { } else if (tile != m_res_fail_tile || td != m_res_fail_td) {
UnreserveRailTrack(tile, TrackdirToTrack(td)); UnreserveRailTrack(tile, TrackdirToTrack(td));

2
src/pbs.cpp
View File

@ -65,7 +65,7 @@ void SetRailStationPlatformReservation(TileIndex start, DiagDirection dir, bool
do { do {
SetRailStationReservation(tile, b); SetRailStationReservation(tile, b);
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
tile = TILE_ADD(tile, diff); tile = TileAdd(tile, diff);
} while (IsCompatibleTrainStationTile(tile, start)); } while (IsCompatibleTrainStationTile(tile, start));
} }

8
src/road_cmd.cpp
View File

@ -292,10 +292,10 @@ CommandCost CheckAllowRemoveRoad(TileIndex tile, RoadBits remove, Owner owner, R
/* Get a bitmask of which neighbouring roads has a tile */ /* Get a bitmask of which neighbouring roads has a tile */
RoadBits n = ROAD_NONE; RoadBits n = ROAD_NONE;
RoadBits present = GetAnyRoadBits(tile, rtt); RoadBits present = GetAnyRoadBits(tile, rtt);
if ((present & ROAD_NE) && (GetAnyRoadBits(TILE_ADDXY(tile, -1, 0), rtt) & ROAD_SW)) n |= ROAD_NE; if ((present & ROAD_NE) && (GetAnyRoadBits(TileAddXY(tile, -1, 0), rtt) & ROAD_SW)) n |= ROAD_NE;
if ((present & ROAD_SE) && (GetAnyRoadBits(TILE_ADDXY(tile, 0, 1), rtt) & ROAD_NW)) n |= ROAD_SE; if ((present & ROAD_SE) && (GetAnyRoadBits(TileAddXY(tile, 0, 1), rtt) & ROAD_NW)) n |= ROAD_SE;
if ((present & ROAD_SW) && (GetAnyRoadBits(TILE_ADDXY(tile, 1, 0), rtt) & ROAD_NE)) n |= ROAD_SW; if ((present & ROAD_SW) && (GetAnyRoadBits(TileAddXY(tile, 1, 0), rtt) & ROAD_NE)) n |= ROAD_SW;
if ((present & ROAD_NW) && (GetAnyRoadBits(TILE_ADDXY(tile, 0, -1), rtt) & ROAD_SE)) n |= ROAD_NW; if ((present & ROAD_NW) && (GetAnyRoadBits(TileAddXY(tile, 0, -1), rtt) & ROAD_SE)) n |= ROAD_NW;
int rating_decrease = RATING_ROAD_DOWN_STEP_EDGE; int rating_decrease = RATING_ROAD_DOWN_STEP_EDGE;
/* If 0 or 1 bits are set in n, or if no bits that match the bits to remove, /* If 0 or 1 bits are set in n, or if no bits that match the bits to remove,

10
src/saveload/afterload.cpp
View File

@ -957,7 +957,7 @@ bool AfterLoadGame()
* an oil rig which got shut down, but not completely removed from * an oil rig which got shut down, but not completely removed from
* the map * the map
*/ */
TileIndex t1 = TILE_ADDXY(t, 0, 1); TileIndex t1 = TileAddXY(t, 0, 1);
if (!IsTileType(t1, MP_INDUSTRY) || GetIndustryGfx(t1) != GFX_OILRIG_1) { if (!IsTileType(t1, MP_INDUSTRY) || GetIndustryGfx(t1) != GFX_OILRIG_1) {
DeleteOilRig(t); DeleteOilRig(t);
} }
@ -2804,12 +2804,12 @@ bool AfterLoadGame()
if (!IsTileType(t, MP_CLEAR) && !IsTileType(t, MP_TREES)) continue; if (!IsTileType(t, MP_CLEAR) && !IsTileType(t, MP_TREES)) continue;
if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_FIELDS)) continue; if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_FIELDS)) continue;
uint fence = GB(t.m4(), 5, 3); uint fence = GB(t.m4(), 5, 3);
if (fence != 0 && IsTileType(TILE_ADDXY(t, 1, 0), MP_CLEAR) && IsClearGround(TILE_ADDXY(t, 1, 0), CLEAR_FIELDS)) { if (fence != 0 && IsTileType(TileAddXY(t, 1, 0), MP_CLEAR) && IsClearGround(TileAddXY(t, 1, 0), CLEAR_FIELDS)) {
SetFence(TILE_ADDXY(t, 1, 0), DIAGDIR_NE, fence); SetFence(TileAddXY(t, 1, 0), DIAGDIR_NE, fence);
} }
fence = GB(t.m4(), 2, 3); fence = GB(t.m4(), 2, 3);
if (fence != 0 && IsTileType(TILE_ADDXY(t, 0, 1), MP_CLEAR) && IsClearGround(TILE_ADDXY(t, 0, 1), CLEAR_FIELDS)) { if (fence != 0 && IsTileType(TileAddXY(t, 0, 1), MP_CLEAR) && IsClearGround(TileAddXY(t, 0, 1), CLEAR_FIELDS)) {
SetFence(TILE_ADDXY(t, 0, 1), DIAGDIR_NW, fence); SetFence(TileAddXY(t, 0, 1), DIAGDIR_NW, fence);
} }
SB(t.m4(), 2, 3, 0); SB(t.m4(), 2, 3, 0);
SB(t.m4(), 5, 3, 0); SB(t.m4(), 5, 3, 0);

2
src/screenshot.cpp
View File

@ -825,7 +825,7 @@ static void HeightmapCallback(void *, void *buffer, uint y, uint, uint n)
*buf = 256 * TileHeight(ti) / (1 + _heightmap_highest_peak); *buf = 256 * TileHeight(ti) / (1 + _heightmap_highest_peak);
buf++; buf++;
if (x == 0) break; if (x == 0) break;
ti = TILE_ADDXY(ti, -1, 0); ti = TileAddXY(ti, -1, 0);
} }
y++; y++;
n--; n--;

4
src/ship_cmd.cpp
View File

@ -410,9 +410,9 @@ static bool CheckShipLeaveDepot(Ship *v)
Axis axis = GetShipDepotAxis(tile); Axis axis = GetShipDepotAxis(tile);
DiagDirection north_dir = ReverseDiagDir(AxisToDiagDir(axis)); DiagDirection north_dir = ReverseDiagDir(AxisToDiagDir(axis));
TileIndex north_neighbour = TILE_ADD(tile, TileOffsByDiagDir(north_dir)); TileIndex north_neighbour = TileAdd(tile, TileOffsByDiagDir(north_dir));
DiagDirection south_dir = AxisToDiagDir(axis); DiagDirection south_dir = AxisToDiagDir(axis);
TileIndex south_neighbour = TILE_ADD(tile, 2 * TileOffsByDiagDir(south_dir)); TileIndex south_neighbour = TileAdd(tile, 2 * TileOffsByDiagDir(south_dir));
TrackBits north_tracks = DiagdirReachesTracks(north_dir) & GetTileShipTrackStatus(north_neighbour); TrackBits north_tracks = DiagdirReachesTracks(north_dir) & GetTileShipTrackStatus(north_neighbour);
TrackBits south_tracks = DiagdirReachesTracks(south_dir) & GetTileShipTrackStatus(south_neighbour); TrackBits south_tracks = DiagdirReachesTracks(south_dir) & GetTileShipTrackStatus(south_neighbour);

4
src/station.cpp
View File

@ -613,7 +613,7 @@ CommandCost StationRect::BeforeAddRect(TileIndex tile, int w, int h, StationRect
if (mode == ADD_FORCE || (w <= _settings_game.station.station_spread && h <= _settings_game.station.station_spread)) { if (mode == ADD_FORCE || (w <= _settings_game.station.station_spread && h <= _settings_game.station.station_spread)) {
/* Important when the old rect is completely inside the new rect, resp. the old one was empty. */ /* Important when the old rect is completely inside the new rect, resp. the old one was empty. */
CommandCost ret = this->BeforeAddTile(tile, mode); CommandCost ret = this->BeforeAddTile(tile, mode);
if (ret.Succeeded()) ret = this->BeforeAddTile(TILE_ADDXY(tile, w - 1, h - 1), mode); if (ret.Succeeded()) ret = this->BeforeAddTile(TileAddXY(tile, w - 1, h - 1), mode);
return ret; return ret;
} }
return CommandCost(); return CommandCost();
@ -694,7 +694,7 @@ bool StationRect::AfterRemoveRect(BaseStation *st, TileArea ta)
assert(this->PtInExtendedRect(TileX(ta.tile) + ta.w - 1, TileY(ta.tile) + ta.h - 1)); assert(this->PtInExtendedRect(TileX(ta.tile) + ta.w - 1, TileY(ta.tile) + ta.h - 1));
bool empty = this->AfterRemoveTile(st, ta.tile); bool empty = this->AfterRemoveTile(st, ta.tile);
if (ta.w != 1 || ta.h != 1) empty = empty || this->AfterRemoveTile(st, TILE_ADDXY(ta.tile, ta.w - 1, ta.h - 1)); if (ta.w != 1 || ta.h != 1) empty = empty || this->AfterRemoveTile(st, TileAddXY(ta.tile, ta.w - 1, ta.h - 1));
return empty; return empty;
} }

2
src/station_gui.cpp
View File

@ -2223,7 +2223,7 @@ static const T *FindStationsNearby(TileArea ta, bool distant_join)
for (const BaseStation *st : BaseStation::Iterate()) { for (const BaseStation *st : BaseStation::Iterate()) {
if (T::IsExpected(st) && !st->IsInUse() && st->owner == _local_company) { if (T::IsExpected(st) && !st->IsInUse() && st->owner == _local_company) {
/* Include only within station spread (yes, it is strictly less than) */ /* Include only within station spread (yes, it is strictly less than) */
if (std::max(DistanceMax(ta.tile, st->xy), DistanceMax(TILE_ADDXY(ta.tile, ta.w - 1, ta.h - 1), st->xy)) < _settings_game.station.station_spread) { if (std::max(DistanceMax(ta.tile, st->xy), DistanceMax(TileAddXY(ta.tile, ta.w - 1, ta.h - 1), st->xy)) < _settings_game.station.station_spread) {
_deleted_stations_nearby.push_back({st->xy, st->index}); _deleted_stations_nearby.push_back({st->xy, st->index});
/* Add the station when it's within where we're going to build */ /* Add the station when it's within where we're going to build */

2
src/tilearea_type.h
View File

@ -58,7 +58,7 @@ struct OrthogonalTileArea {
*/ */
TileIndex GetCenterTile() const TileIndex GetCenterTile() const
{ {
return TILE_ADDXY(this->tile, this->w / 2, this->h / 2); return TileAddXY(this->tile, this->w / 2, this->h / 2);
} }
OrthogonalTileIterator begin() const; OrthogonalTileIterator begin() const;

20
src/town_cmd.cpp
View File

@ -514,10 +514,10 @@ static void AdvanceSingleHouseConstruction(TileIndex tile)
static void AdvanceHouseConstruction(TileIndex tile) static void AdvanceHouseConstruction(TileIndex tile)
{ {
uint flags = HouseSpec::Get(GetHouseType(tile))->building_flags; uint flags = HouseSpec::Get(GetHouseType(tile))->building_flags;
if (flags & BUILDING_HAS_1_TILE) AdvanceSingleHouseConstruction(TILE_ADDXY(tile, 0, 0)); if (flags & BUILDING_HAS_1_TILE) AdvanceSingleHouseConstruction(TileAddXY(tile, 0, 0));
if (flags & BUILDING_2_TILES_Y) AdvanceSingleHouseConstruction(TILE_ADDXY(tile, 0, 1)); if (flags & BUILDING_2_TILES_Y) AdvanceSingleHouseConstruction(TileAddXY(tile, 0, 1));
if (flags & BUILDING_2_TILES_X) AdvanceSingleHouseConstruction(TILE_ADDXY(tile, 1, 0)); if (flags & BUILDING_2_TILES_X) AdvanceSingleHouseConstruction(TileAddXY(tile, 1, 0));
if (flags & BUILDING_HAS_4_TILES) AdvanceSingleHouseConstruction(TILE_ADDXY(tile, 1, 1)); if (flags & BUILDING_HAS_4_TILES) AdvanceSingleHouseConstruction(TileAddXY(tile, 1, 1));
} }
/** /**
@ -686,11 +686,11 @@ static void TileLoop_Town(TileIndex tile)
int y = Clamp(grid_pos.y, 0, 1); int y = Clamp(grid_pos.y, 0, 1);
if (hs->building_flags & TILE_SIZE_2x2) { if (hs->building_flags & TILE_SIZE_2x2) {
tile = TILE_ADDXY(tile, x, y); tile = TileAddXY(tile, x, y);
} else if (hs->building_flags & TILE_SIZE_1x2) { } else if (hs->building_flags & TILE_SIZE_1x2) {
tile = TILE_ADDXY(tile, 0, y); tile = TileAddXY(tile, 0, y);
} else if (hs->building_flags & TILE_SIZE_2x1) { } else if (hs->building_flags & TILE_SIZE_2x1) {
tile = TILE_ADDXY(tile, x, 0); tile = TileAddXY(tile, x, 0);
} }
} }
@ -971,7 +971,7 @@ static bool IsNeighborRoadTile(TileIndex tile, const DiagDirection dir, uint dis
/* Test for roadbit parallel to dir and facing towards the middle axis */ /* Test for roadbit parallel to dir and facing towards the middle axis */
if (IsValidTile(tile + cur) && if (IsValidTile(tile + cur) &&
GetTownRoadBits(TILE_ADD(tile, cur)) & DiagDirToRoadBits((pos & 2) ? dir : ReverseDiagDir(dir))) return true; GetTownRoadBits(TileAdd(tile, cur)) & DiagDirToRoadBits((pos & 2) ? dir : ReverseDiagDir(dir))) return true;
} }
return false; return false;
} }
@ -1833,7 +1833,7 @@ static bool GrowTown(Town *t)
cur_company.Restore(); cur_company.Restore();
return success; return success;
} }
tile = TILE_ADD(tile, ToTileIndexDiff(*ptr)); tile = TileAdd(tile, ToTileIndexDiff(*ptr));
} }
/* No road available, try to build a random road block by /* No road available, try to build a random road block by
@ -1850,7 +1850,7 @@ static bool GrowTown(Town *t)
return true; return true;
} }
} }
tile = TILE_ADD(tile, ToTileIndexDiff(*ptr)); tile = TileAdd(tile, ToTileIndexDiff(*ptr));
} }
} }

12
src/viewport.cpp
View File

@ -2893,8 +2893,8 @@ static int CalcHeightdiff(HighLightStyle style, uint distance, TileIndex start_t
/* In the case of an area we can determine whether we were dragging south or /* In the case of an area we can determine whether we were dragging south or
* east by checking the X-coordinates of the tiles */ * east by checking the X-coordinates of the tiles */
byte style_t = (byte)(TileX(end_tile) > TileX(start_tile)); byte style_t = (byte)(TileX(end_tile) > TileX(start_tile));
start_tile = TILE_ADD(start_tile, ToTileIndexDiff(heightdiff_area_by_dir[style_t])); start_tile = TileAdd(start_tile, ToTileIndexDiff(heightdiff_area_by_dir[style_t]));
end_tile = TILE_ADD(end_tile, ToTileIndexDiff(heightdiff_area_by_dir[2 + style_t])); end_tile = TileAdd(end_tile, ToTileIndexDiff(heightdiff_area_by_dir[2 + style_t]));
[[fallthrough]]; [[fallthrough]];
} }
@ -2928,16 +2928,16 @@ static int CalcHeightdiff(HighLightStyle style, uint distance, TileIndex start_t
/* Use lookup table for start-tile based on HighLightStyle direction */ /* Use lookup table for start-tile based on HighLightStyle direction */
byte style_t = style * 2; byte style_t = style * 2;
assert(style_t < lengthof(heightdiff_line_by_dir) - 13); assert(style_t < lengthof(heightdiff_line_by_dir) - 13);
h0 = TileHeight(TILE_ADD(start_tile, ToTileIndexDiff(heightdiff_line_by_dir[style_t]))); h0 = TileHeight(TileAdd(start_tile, ToTileIndexDiff(heightdiff_line_by_dir[style_t])));
uint ht = TileHeight(TILE_ADD(start_tile, ToTileIndexDiff(heightdiff_line_by_dir[style_t + 1]))); uint ht = TileHeight(TileAdd(start_tile, ToTileIndexDiff(heightdiff_line_by_dir[style_t + 1])));
h0 = std::max(h0, ht); h0 = std::max(h0, ht);
/* Use lookup table for end-tile based on HighLightStyle direction /* Use lookup table for end-tile based on HighLightStyle direction
* flip around side (lower/upper, left/right) based on distance */ * flip around side (lower/upper, left/right) based on distance */
if (distance == 0) style_t = flip_style_direction[style] * 2; if (distance == 0) style_t = flip_style_direction[style] * 2;
assert(style_t < lengthof(heightdiff_line_by_dir) - 13); assert(style_t < lengthof(heightdiff_line_by_dir) - 13);
h1 = TileHeight(TILE_ADD(end_tile, ToTileIndexDiff(heightdiff_line_by_dir[12 + style_t]))); h1 = TileHeight(TileAdd(end_tile, ToTileIndexDiff(heightdiff_line_by_dir[12 + style_t])));
ht = TileHeight(TILE_ADD(end_tile, ToTileIndexDiff(heightdiff_line_by_dir[12 + style_t + 1]))); ht = TileHeight(TileAdd(end_tile, ToTileIndexDiff(heightdiff_line_by_dir[12 + style_t + 1])));
h1 = std::max(h1, ht); h1 = std::max(h1, ht);
break; break;
} }

16
src/water_cmd.cpp
View File

@ -722,10 +722,10 @@ static void DrawWaterEdges(bool canal, uint offset, TileIndex tile)
uint wa; uint wa;
/* determine the edges around with water. */ /* determine the edges around with water. */
wa = IsWateredTile(TILE_ADDXY(tile, -1, 0), DIR_SW) << 0; wa = IsWateredTile(TileAddXY(tile, -1, 0), DIR_SW) << 0;
wa += IsWateredTile(TILE_ADDXY(tile, 0, 1), DIR_NW) << 1; wa += IsWateredTile(TileAddXY(tile, 0, 1), DIR_NW) << 1;
wa += IsWateredTile(TILE_ADDXY(tile, 1, 0), DIR_NE) << 2; wa += IsWateredTile(TileAddXY(tile, 1, 0), DIR_NE) << 2;
wa += IsWateredTile(TILE_ADDXY(tile, 0, -1), DIR_SE) << 3; wa += IsWateredTile(TileAddXY(tile, 0, -1), DIR_SE) << 3;
if (!(wa & 1)) DrawWaterSprite(base, offset, feature, tile); if (!(wa & 1)) DrawWaterSprite(base, offset, feature, tile);
if (!(wa & 2)) DrawWaterSprite(base, offset + 1, feature, tile); if (!(wa & 2)) DrawWaterSprite(base, offset + 1, feature, tile);
@ -735,25 +735,25 @@ static void DrawWaterEdges(bool canal, uint offset, TileIndex tile)
/* right corner */ /* right corner */
switch (wa & 0x03) { switch (wa & 0x03) {
case 0: DrawWaterSprite(base, offset + 4, feature, tile); break; case 0: DrawWaterSprite(base, offset + 4, feature, tile); break;
case 3: if (!IsWateredTile(TILE_ADDXY(tile, -1, 1), DIR_W)) DrawWaterSprite(base, offset + 8, feature, tile); break; case 3: if (!IsWateredTile(TileAddXY(tile, -1, 1), DIR_W)) DrawWaterSprite(base, offset + 8, feature, tile); break;
} }
/* bottom corner */ /* bottom corner */
switch (wa & 0x06) { switch (wa & 0x06) {
case 0: DrawWaterSprite(base, offset + 5, feature, tile); break; case 0: DrawWaterSprite(base, offset + 5, feature, tile); break;
case 6: if (!IsWateredTile(TILE_ADDXY(tile, 1, 1), DIR_N)) DrawWaterSprite(base, offset + 9, feature, tile); break; case 6: if (!IsWateredTile(TileAddXY(tile, 1, 1), DIR_N)) DrawWaterSprite(base, offset + 9, feature, tile); break;
} }
/* left corner */ /* left corner */
switch (wa & 0x0C) { switch (wa & 0x0C) {
case 0: DrawWaterSprite(base, offset + 6, feature, tile); break; case 0: DrawWaterSprite(base, offset + 6, feature, tile); break;
case 12: if (!IsWateredTile(TILE_ADDXY(tile, 1, -1), DIR_E)) DrawWaterSprite(base, offset + 10, feature, tile); break; case 12: if (!IsWateredTile(TileAddXY(tile, 1, -1), DIR_E)) DrawWaterSprite(base, offset + 10, feature, tile); break;
} }
/* upper corner */ /* upper corner */
switch (wa & 0x09) { switch (wa & 0x09) {
case 0: DrawWaterSprite(base, offset + 7, feature, tile); break; case 0: DrawWaterSprite(base, offset + 7, feature, tile); break;
case 9: if (!IsWateredTile(TILE_ADDXY(tile, -1, -1), DIR_S)) DrawWaterSprite(base, offset + 11, feature, tile); break; case 9: if (!IsWateredTile(TileAddXY(tile, -1, -1), DIR_S)) DrawWaterSprite(base, offset + 11, feature, tile); break;
} }
} }