(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
--- a/ai.c Fri Jan 07 12:33:28 2005 +0000
+++ b/ai.c Fri Jan 07 17:02:43 2005 +0000
@@ -622,17 +622,17 @@
static byte AiGetDirectionBetweenTiles(TileIndex a, TileIndex b)
{
- byte i = (GET_TILE_X(a) < GET_TILE_X(b)) ? 1 : 0;
- if (GET_TILE_Y(a) >= GET_TILE_Y(b)) i ^= 3;
+ byte i = (TileX(a) < TileX(b)) ? 1 : 0;
+ if (TileY(a) >= TileY(b)) i ^= 3;
return i;
}
static TileIndex AiGetPctTileBetween(TileIndex a, TileIndex b, byte pct)
{
return TILE_XY(
- GET_TILE_X(a) + ((GET_TILE_X(b) - GET_TILE_X(a)) * pct >> 8),
- GET_TILE_Y(a) + ((GET_TILE_Y(b) - GET_TILE_Y(a)) * pct >> 8)
- );
+ TileX(a) + ((TileX(b) - TileX(a)) * pct >> 8),
+ TileY(a) + ((TileY(b) - TileY(a)) * pct >> 8)
+ );
}
static void AiWantLongIndustryRoute(Player *p)
--- a/ai_new.c Fri Jan 07 12:33:28 2005 +0000
+++ b/ai_new.c Fri Jan 07 17:02:43 2005 +0000
@@ -606,8 +606,8 @@
// where we get the most cargo and where it is buildable.
// TODO: also check for station of myself and make sure we are not
// taking eachothers passangers away (bad result when it does not)
- for (x = GET_TILE_X(tile) - AI_FINDSTATION_TILE_RANGE; x <= GET_TILE_X(tile) + AI_FINDSTATION_TILE_RANGE; x++) {
- for (y = GET_TILE_Y(tile) - AI_FINDSTATION_TILE_RANGE; y <= GET_TILE_Y(tile) + AI_FINDSTATION_TILE_RANGE; y++) {
+ for (x = TileX(tile) - AI_FINDSTATION_TILE_RANGE; x <= TileX(tile) + AI_FINDSTATION_TILE_RANGE; x++) {
+ for (y = TileY(tile) - AI_FINDSTATION_TILE_RANGE; y <= TileY(tile) + AI_FINDSTATION_TILE_RANGE; y++) {
new_tile = TILE_XY(x,y);
if (IS_TILETYPE(new_tile, MP_CLEAR) || IS_TILETYPE(new_tile, MP_TREES)) {
// This tile we can build on!
--- a/ai_pathfinder.c Fri Jan 07 12:33:28 2005 +0000
+++ b/ai_pathfinder.c Fri Jan 07 17:02:43 2005 +0000
@@ -28,7 +28,7 @@
}
// Checks if a tile 'a' is between the tiles 'b' and 'c'
-#define TILES_BETWEEN(a,b,c) (GET_TILE_X(a) >= GET_TILE_X(b) && GET_TILE_X(a) <= GET_TILE_X(c) && GET_TILE_Y(a) >= GET_TILE_Y(b) && GET_TILE_Y(a) <= GET_TILE_Y(c))
+#define TILES_BETWEEN(a, b, c) (TileX(a) >= TileX(b) && TileX(a) <= TileX(c) && TileY(a) >= TileY(b) && TileY(a) <= TileY(c))
// Check if the current tile is in our end-area
int32 AyStar_AiPathFinder_EndNodeCheck(AyStar *aystar, OpenListNode *current) {
@@ -46,7 +46,7 @@
// Calculates the hash
// Currently it is a 10 bit hash, so the hash array has a max depth of 6 bits (so 64)
uint AiPathFinder_Hash(uint key1, uint key2) {
- return (GET_TILE_X(key1) & 0x1F) + ((GET_TILE_Y(key1) & 0x1F) << 5);
+ return (TileX(key1) & 0x1F) + ((TileY(key1) & 0x1F) << 5);
}
// Clear the memory of all the things
@@ -90,8 +90,8 @@
start_node.node.user_data[0] = 0;
// Now we add all the starting tiles
- for (x=GET_TILE_X(PathFinderInfo->start_tile_tl);x<=GET_TILE_X(PathFinderInfo->start_tile_br);x++) {
- for (y=GET_TILE_Y(PathFinderInfo->start_tile_tl);y<=GET_TILE_Y(PathFinderInfo->start_tile_br);y++) {
+ for (x = TileX(PathFinderInfo->start_tile_tl); x <= TileX(PathFinderInfo->start_tile_br); x++) {
+ for (y = TileY(PathFinderInfo->start_tile_tl); y <= TileY(PathFinderInfo->start_tile_br); y++) {
start_node.node.tile = TILE_XY(x,y);
result->addstart(result, &start_node.node);
}
@@ -117,8 +117,8 @@
start_node.node.tile = PathFinderInfo->start_tile_tl;
// Now we add all the starting tiles
- for (x=GET_TILE_X(PathFinderInfo->start_tile_tl);x<=GET_TILE_X(PathFinderInfo->start_tile_br);x++) {
- for (y=GET_TILE_Y(PathFinderInfo->start_tile_tl);y<=GET_TILE_Y(PathFinderInfo->start_tile_br);y++) {
+ for (x = TileX(PathFinderInfo->start_tile_tl); x <= TileX(PathFinderInfo->start_tile_br); x++) {
+ for (y = TileY(PathFinderInfo->start_tile_tl); y <= TileY(PathFinderInfo->start_tile_br); y++) {
if (!(IS_TILETYPE(TILE_XY(x,y), MP_CLEAR) || IS_TILETYPE(TILE_XY(x,y), MP_TREES))) continue;
if (!TestCanBuildStationHere(TILE_XY(x,y),TEST_STATION_NO_DIR)) continue;
start_node.node.tile = TILE_XY(x,y);
@@ -175,8 +175,10 @@
// Go through all surrounding tiles and check if they are within the limits
for (i=0;i<4;i++) {
- if (GET_TILE_X(TileOffsByDir(i) + current->path.node.tile) > 1 && GET_TILE_X(TileOffsByDir(i) + current->path.node.tile) < MapMaxX() - 1 &&
- GET_TILE_Y(TileOffsByDir(i) + current->path.node.tile) > 1 && GET_TILE_Y(TileOffsByDir(i) + current->path.node.tile) < MapMaxY() - 1) {
+ if (TileX(TileOffsByDir(i) + current->path.node.tile) > 1 &&
+ TileX(TileOffsByDir(i) + current->path.node.tile) < MapMaxX() - 1 &&
+ TileY(TileOffsByDir(i) + current->path.node.tile) > 1 &&
+ TileY(TileOffsByDir(i) + current->path.node.tile) < MapMaxY() - 1) {
// We also directly test if the current tile can connect to this tile..
// We do this simply by just building the tile!
--- a/ai_shared.c Fri Jan 07 12:33:28 2005 +0000
+++ b/ai_shared.c Fri Jan 07 17:02:43 2005 +0000
@@ -15,13 +15,13 @@
int x1, x2, x3;
int y1, y2, y3;
- x1 = GET_TILE_X(tile_a);
- x2 = GET_TILE_X(tile_b);
- x3 = GET_TILE_X(tile_c);
+ x1 = TileX(tile_a);
+ x2 = TileX(tile_b);
+ x3 = TileX(tile_c);
- y1 = GET_TILE_Y(tile_a);
- y2 = GET_TILE_Y(tile_b);
- y3 = GET_TILE_Y(tile_c);
+ y1 = TileY(tile_a);
+ y2 = TileY(tile_b);
+ y3 = TileY(tile_c);
if (y1 == y2 && y2 == y3) return 0;
if (x1 == x2 && x2 == x3) return 1;
@@ -50,13 +50,13 @@
int y1, y2, y3;
int r;
- x1 = GET_TILE_X(tile_a);
- x2 = GET_TILE_X(tile_b);
- x3 = GET_TILE_X(tile_c);
+ x1 = TileX(tile_a);
+ x2 = TileX(tile_b);
+ x3 = TileX(tile_c);
- y1 = GET_TILE_Y(tile_a);
- y2 = GET_TILE_Y(tile_b);
- y3 = GET_TILE_Y(tile_c);
+ y1 = TileY(tile_a);
+ y2 = TileY(tile_b);
+ y3 = TileY(tile_c);
r = 0;
@@ -75,9 +75,9 @@
// Get's the direction between 2 tiles seen from tile_a
int AiNew_GetDirection(uint tile_a, uint tile_b) {
- if (GET_TILE_Y(tile_a) < GET_TILE_Y(tile_b)) return 1;
- if (GET_TILE_Y(tile_a) > GET_TILE_Y(tile_b)) return 3;
- if (GET_TILE_X(tile_a) < GET_TILE_X(tile_b)) return 2;
+ if (TileY(tile_a) < TileY(tile_b)) return 1;
+ if (TileY(tile_a) > TileY(tile_b)) return 3;
+ if (TileX(tile_a) < TileX(tile_b)) return 2;
return 0;
}
--- a/aircraft_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/aircraft_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -146,8 +146,8 @@
v->tile = tile;
// u->tile = 0;
- x = GET_TILE_X(tile)*16 + 5;
- y = GET_TILE_Y(tile)*16 + 3;
+ x = TileX(tile) * 16 + 5;
+ y = TileY(tile) * 16 + 3;
v->x_pos = u->x_pos = x;
v->y_pos = u->y_pos = y;
@@ -739,8 +739,8 @@
uint tile = st->airport_tile;
if (tile == 0) tile = st->xy;
// xy of destination
- x = GET_TILE_X(tile)*16;
- y = GET_TILE_Y(tile)*16;
+ x = TileX(tile) * 16;
+ y = TileY(tile) * 16;
}
// get airport moving data
--- a/aystar.c Fri Jan 07 12:33:28 2005 +0000
+++ b/aystar.c Fri Jan 07 17:02:43 2005 +0000
@@ -246,7 +246,8 @@
*/
void AyStarMain_AddStartNode(AyStar *aystar, AyStarNode *start_node) {
#ifdef AYSTAR_DEBUG
- printf("[AyStar] Starting A* Algorithm from node (%d, %d, %d)\n", GET_TILE_X(start_node->tile), GET_TILE_Y(start_node->tile), start_node->direction);
+ printf("[AyStar] Starting A* Algorithm from node (%d, %d, %d)\n",
+ TileX(start_node->tile), TileY(start_node->tile), start_node->direction);
#endif
AyStarMain_OpenList_Add(aystar, NULL, start_node, 0, 0, 0);
}
--- a/bridge_gui.c Fri Jan 07 12:33:28 2005 +0000
+++ b/bridge_gui.c Fri Jan 07 17:02:43 2005 +0000
@@ -161,6 +161,7 @@
w->vscroll.cap = 4;
w->vscroll.count = (byte)j;
} else {
- ShowErrorMessage(errmsg, STR_5015_CAN_T_BUILD_BRIDGE_HERE, GET_TILE_X(end) * 16, GET_TILE_Y(end) * 16);
+ ShowErrorMessage(errmsg, STR_5015_CAN_T_BUILD_BRIDGE_HERE,
+ TileX(end) * 16, TileY(end) * 16);
}
}
--- a/clear_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/clear_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -30,7 +30,7 @@
TileIndex *t;
int count;
- if (GET_TILE_X(tile) == MapMaxX() || GET_TILE_Y(tile) == MapMaxY())
+ if (TileX(tile) == MapMaxX() || TileY(tile) == MapMaxY())
return -1;
t = ts->tile_table;
@@ -343,8 +343,8 @@
ex >>= 4; ey >>= 4;
// make sure sx,sy are smaller than ex,ey
- sx = GET_TILE_X(p1);
- sy = GET_TILE_Y(p1);
+ sx = TileX(p1);
+ sy = TileY(p1);
if (ex < sx) intswap(ex, sx);
if (ey < sy) intswap(ey, sy);
tile = TILE_XY(sx,sy);
--- a/command.c Fri Jan 07 12:33:28 2005 +0000
+++ b/command.c Fri Jan 07 17:02:43 2005 +0000
@@ -325,7 +325,7 @@
int32 DoCommandByTile(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc)
{
- return DoCommand(GET_TILE_X(tile)*16, GET_TILE_Y(tile)*16, p1, p2, flags, procc);
+ return DoCommand(TileX(tile) * 16, TileY(tile) * 16, p1, p2, flags, procc);
}
@@ -401,8 +401,8 @@
uint32 flags;
bool notest;
- int x = GET_TILE_X(tile)*16;
- int y = GET_TILE_Y(tile)*16;
+ int x = TileX(tile) * 16;
+ int y = TileY(tile) * 16;
assert(_docommand_recursive == 0);
--- a/disaster_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/disaster_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -253,8 +253,8 @@
if (v->current_order.station == 0) {
// fly around randomly
- int x = GET_TILE_X(v->dest_tile)*16;
- int y = GET_TILE_Y(v->dest_tile)*16;
+ int x = TileX(v->dest_tile) * 16;
+ int y = TileY(v->dest_tile) * 16;
if (abs(x - v->x_pos) + abs(y - v->y_pos) >= 16) {
v->direction = GetDirectionTowards(v, x, y);
GetNewVehiclePos(v, &gp);
@@ -352,8 +352,8 @@
if (v->current_order.station == 2) {
if (!(v->tick_counter&3)) {
Industry *i = GetIndustry(v->dest_tile);
- int x = GET_TILE_X(i->xy)*16;
- int y = GET_TILE_Y(i->xy)*16;
+ int x = TileX(i->xy) * 16;
+ int y = TileY(i->xy) * 16;
uint32 r = Random();
CreateEffectVehicleAbove(
@@ -423,8 +423,8 @@
if (v->current_order.station == 2) {
if (!(v->tick_counter&3)) {
Industry *i = GetIndustry(v->dest_tile);
- int x = GET_TILE_X(i->xy)*16;
- int y = GET_TILE_Y(i->xy)*16;
+ int x = TileX(i->xy) * 16;
+ int y = TileY(i->xy) * 16;
uint32 r = Random();
CreateEffectVehicleAbove(
@@ -501,8 +501,8 @@
v->tick_counter++;
if (v->current_order.station == 1) {
- int x = GET_TILE_X(v->dest_tile)*16 + 8;
- int y = GET_TILE_Y(v->dest_tile)*16 + 8;
+ int x = TileX(v->dest_tile) * 16 + 8;
+ int y = TileY(v->dest_tile) * 16 + 8;
if (abs(v->x_pos - x) + abs(v->y_pos - y) >= 8) {
v->direction = GetDirectionTowards(v, x, y);
@@ -553,8 +553,8 @@
w->vehstatus |= VS_DISASTER;
} else if (v->current_order.station < 1) {
- int x = GET_TILE_X(v->dest_tile)*16;
- int y = GET_TILE_Y(v->dest_tile)*16;
+ int x = TileX(v->dest_tile) * 16;
+ int y = TileY(v->dest_tile) * 16;
if (abs(x - v->x_pos) + abs(y - v->y_pos) >= 16) {
v->direction = GetDirectionTowards(v, x, y);
GetNewVehiclePos(v, &gp);
@@ -702,13 +702,13 @@
/* Pick a random place, unless we find
a small airport */
- x = (GET_TILE_X(Random())) * 16 + 8;
+ x = TileX(Random()) * 16 + 8;
FOR_ALL_STATIONS(st) {
if (st->xy && st->airport_tile != 0 &&
st->airport_type <= 1 &&
IS_HUMAN_PLAYER(st->owner)) {
- x = (GET_TILE_X(st->xy) + 2) * 16;
+ x = (TileX(st->xy) + 2) * 16;
break;
}
}
@@ -732,7 +732,7 @@
if (v == NULL)
return;
- x = (GET_TILE_X(Random())) * 16 + 8;
+ x = TileX(Random()) * 16 + 8;
InitializeDisasterVehicle(v, x, 0, 135, 3, 2);
v->dest_tile = TILE_XY(MapSizeX() / 2, MapSizeY() / 2);
@@ -771,7 +771,7 @@
return;
x = (MapSizeX() + 9) * 16 - 1;
- y = GET_TILE_Y(found->xy)*16 + 37;
+ y = TileY(found->xy) * 16 + 37;
InitializeDisasterVehicle(v,x,y, 135,1,4);
@@ -807,7 +807,7 @@
return;
x = -16 * 16;
- y = GET_TILE_Y(found->xy)*16 + 37;
+ y = TileY(found->xy) * 16 + 37;
InitializeDisasterVehicle(v,x,y, 135,5,6);
@@ -833,7 +833,7 @@
if (v == NULL)
return;
- x = (GET_TILE_X(Random())) * 16 + 8;
+ x = TileX(Random()) * 16 + 8;
y = MapMaxX() * 16 - 1;
InitializeDisasterVehicle(v, x, y, 135, 7, 9);
@@ -861,7 +861,7 @@
return;
r = Random();
- x = (GET_TILE_X(r)) * 16 + 8;
+ x = TileX(r) * 16 + 8;
y = 8;
dir = 3;
@@ -882,7 +882,7 @@
return;
r = Random();
- x = (GET_TILE_X(r)) * 16 + 8;
+ x = TileX(r) * 16 + 8;
y = 8;
dir = 3;
--- a/industry_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/industry_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -628,7 +628,7 @@
static void MakeIndustryTileBiggerCase8(uint tile)
{
TileInfo ti;
- FindLandscapeHeight(&ti, GET_TILE_X(tile)*16, GET_TILE_Y(tile)*16);
+ FindLandscapeHeight(&ti, TileX(tile) * 16, TileY(tile) * 16);
CreateEffectVehicle(ti.x + 15, ti.y + 14, ti.z + 59 + (ti.tileh != 0 ? 8 : 0), EV_INDUSTRYSMOKE);
}
@@ -692,8 +692,8 @@
dir = Random() & 3;
v = CreateEffectVehicleAbove(
- GET_TILE_X(tile)*16 + _tileloop_ind_case_161[dir + 0],
- GET_TILE_Y(tile)*16 + _tileloop_ind_case_161[dir + 4],
+ TileX(tile) * 16 + _tileloop_ind_case_161[dir + 0],
+ TileY(tile) * 16 + _tileloop_ind_case_161[dir + 4],
_tileloop_ind_case_161[dir + 8],
EV_INDUSTRY_SMOKE
);
@@ -779,7 +779,7 @@
break;
case 49: {
- CreateEffectVehicleAbove(GET_TILE_X(tile)*16 + 6, GET_TILE_Y(tile)*16 + 6, 43, EV_SMOKE_3);
+ CreateEffectVehicleAbove(TileX(tile) * 16 + 6, TileY(tile) * 16 + 6, 43, EV_SMOKE_3);
} break;
@@ -1145,8 +1145,8 @@
if (type != IT_OIL_RIG && _game_mode == GM_EDITOR)
return true;
- x = GET_TILE_X(tile);
- y = GET_TILE_Y(tile);
+ x = TileX(tile);
+ y = TileY(tile);
if ( x < 15 || y < 15 || x > 238 || y > 238)
return true;
@@ -1217,8 +1217,8 @@
static bool CheckSuitableIndustryPos(uint tile)
{
- uint x = GET_TILE_X(tile);
- uint y = GET_TILE_Y(tile);
+ uint x = TileX(tile);
+ uint y = TileY(tile);
if ( x < 2 || y < 2 || x > MapMaxX() - 3 || y > MapMaxY() - 3) {
_error_message = STR_0239_SITE_UNSUITABLE;
--- a/landscape.c Fri Jan 07 12:33:28 2005 +0000
+++ b/landscape.c Fri Jan 07 17:02:43 2005 +0000
@@ -45,13 +45,13 @@
uint a,b,c,d,min;
int r;
- if (GET_TILE_X(tile) == MapMaxX() || GET_TILE_Y(tile) == MapMaxY()) {
+ if (TileX(tile) == MapMaxX() || TileY(tile) == MapMaxY()) {
if (h)
*h = 0;
return 0;
}
- assert(tile < MapSize() && GET_TILE_X(tile) != MapMaxX() && GET_TILE_Y(tile) != MapMaxY());
+ assert(tile < MapSize() && TileX(tile) != MapMaxX() && TileY(tile) != MapMaxY());
min = a = _map_type_and_height[tile] & 0xF;
b = _map_type_and_height[tile+TILE_XY(1,0)] & 0xF;
@@ -82,7 +82,7 @@
void FindLandscapeHeightByTile(TileInfo *ti, uint tile)
{
- if (GET_TILE_X(tile) == MapMaxX() || GET_TILE_Y(tile) == MapMaxY()) {
+ if (TileX(tile) == MapMaxX() || TileY(tile) == MapMaxY()) {
ti->tileh = 0;
ti->type = MP_VOID;
ti->tile = 0;
@@ -354,8 +354,8 @@
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
// make sure sx,sy are smaller than ex,ey
- sx = GET_TILE_X(p1)*16;
- sy = GET_TILE_Y(p1)*16;
+ sx = TileX(p1) * 16;
+ sy = TileY(p1) * 16;
if (ex < sx) intswap(ex, sx);
if (ey < sy) intswap(ey, sy);
@@ -445,8 +445,8 @@
uint GetMapExtraBits(uint tile)
{
- if (GET_TILE_X(tile) < MapSizeX() && GET_TILE_Y(tile) < MapSizeY() &&
- GET_TILE_X(tile) > 0 && GET_TILE_Y(tile) > 0)
+ if (TileX(tile) < MapSizeX() && TileY(tile) < MapSizeY() &&
+ TileX(tile) > 0 && TileY(tile) > 0)
return (_map_extra_bits[tile >> 2] >> (tile&3)*2)&3;
else
return 0;
@@ -469,7 +469,7 @@
do {
_tile_type_procs[GET_TILETYPE(tile)]->tile_loop_proc(tile);
- if ( GET_TILE_X(tile) < MapSizeX() - TILELOOP_SIZE) {
+ if (TileX(tile) < MapSizeX() - TILELOOP_SIZE) {
tile += TILELOOP_SIZE; /* no overflow */
} else {
tile = TILE_MASK(tile - TILELOOP_SIZE * (MapSizeX() / TILELOOP_SIZE-1) + TILE_XY(0, TILELOOP_SIZE)); /* x would overflow, also increase y */
@@ -515,9 +515,9 @@
_map_owner[tile] = OWNER_WATER;
}
tile++;
- if (GET_TILE_X(tile) == MapMaxX()) {
+ if (TileX(tile) == MapMaxX()) {
tile += TILE_XY(-(int)MapMaxX(), 1);
- if (GET_TILE_Y(tile) == MapMaxY())
+ if (TileY(tile) == MapMaxY())
break;
}
}
@@ -735,8 +735,8 @@
uint32 r = Random();
return TILE_XY(
- GET_TILE_X(a) + ((byte)r * rn * 2 >> 8) - rn,
- GET_TILE_Y(a) + ((byte)(r>>8) * rn * 2 >> 8) - rn
+ TileX(a) + ((byte)r * rn * 2 >> 8) - rn,
+ TileY(a) + ((byte)(r >> 8) * rn * 2 >> 8) - rn
);
}
@@ -749,8 +749,8 @@
uint TileAddWrap(TileIndex tile, int addx, int addy)
{
uint x, y;
- x = GET_TILE_X(tile) + addx;
- y = GET_TILE_Y(tile) + addy;
+ x = TileX(tile) + addx;
+ y = TileY(tile) + addy;
// Are we about to wrap?
if (x < MapMaxX() && y < MapMaxY())
@@ -761,5 +761,5 @@
bool IsValidTile(uint tile)
{
- return (tile < MapSizeX() * MapMaxY() && GET_TILE_X(tile) != MapMaxX());
+ return (tile < MapSizeX() * MapMaxY() && TileX(tile) != MapMaxX());
}
--- a/macros.h Fri Jan 07 12:33:28 2005 +0000
+++ b/macros.h Fri Jan 07 17:02:43 2005 +0000
@@ -1,6 +1,8 @@
#ifndef MACROS_H
#define MACROS_H
+#include "map.h"
+
#define MAX_INT 0x7FFFFFFF
#ifdef min
@@ -96,16 +98,6 @@
#define TILE_ADDXY(tile, x, y) TILE_ADD(tile, TILE_XY(x,y))
-#if TILE_X_BITS == 8
-#define GET_TILE_X(t) (uint)((byte)(t))
-#define GET_TILE_Y(t) (uint)((t) >> 8)
-#define TILE_MASK(x) ((uint16)(x))
-#else
-#define GET_TILE_X(t) (uint)((t) & ((1 << TILE_X_BITS)-1))
-#define GET_TILE_Y(t) (uint)((t) >> TILE_X_BITS)
-#define TILE_MASK(x) (int)((x) & ((1 << (TILE_X_BITS + TILE_Y_BITS))-1))
-#endif
-
//#define REMADP_COORDS(x,y,z) { int t = x; x = (y-t)*2; y+=t-z; }
#define PACK_POINT(x,y) ((x) | ((y) << 16))
@@ -148,8 +140,6 @@
}
-typedef uint16 TileIndex;
-
/* [min,max), strictly less than */
#define IS_BYTE_INSIDE(a,min,max) ((byte)((a)-(min)) < (byte)((max)-(min)))
#define IS_INT_INSIDE(a,min,max) ((uint)((a)-(min)) < (uint)((max)-(min)))
--- a/main_gui.c Fri Jan 07 12:33:28 2005 +0000
+++ b/main_gui.c Fri Jan 07 17:02:43 2005 +0000
@@ -381,7 +381,8 @@
/* Are we allowed to change the name of the waypoint? */
if (!CheckTileOwnership(cp->xy)) {
- ShowErrorMessage(_error_message, STR_CANT_CHANGE_WAYPOINT_NAME, GET_TILE_X(cp->xy) * 16, GET_TILE_Y(cp->xy) * 16);
+ ShowErrorMessage(_error_message, STR_CANT_CHANGE_WAYPOINT_NAME,
+ TileX(cp->xy) * 16, TileY(cp->xy) * 16);
return;
}
@@ -1143,7 +1144,7 @@
_generating_world = true;
-// tile = TILE_FROM_XY(GET_TILE_X(tile)*16+_tile_fract_coords.x + 8,GET_TILE_Y(tile)*16+_tile_fract_coords.y + 8);
+// tile = TILE_FROM_XY(TileX(tile) * 16 + _tile_fract_coords.x + 8, TileY(tile) * 16 + _tile_fract_coords.y + 8);
if (_terraform_size == 1) {
DoCommandP(tile, 8, (uint32)mode, CcTerraform, CMD_TERRAFORM_LAND | CMD_AUTO);
@@ -1190,7 +1191,7 @@
//{
// if (success) {
//SndPlayTileFx(0x10, tile);
- //CreateEffectVehicleAbove(GET_TILE_X(tile)*16 + 8,GET_TILE_Y(tile)*16 + 8, 2, EV_DEMOLISH);
+ //CreateEffectVehicleAbove(TileX(tile) * 16 + 8, TileY(tile) * 16 + 8, 2, EV_DEMOLISH);
// }
//}
--- a/map.h Fri Jan 07 12:33:28 2005 +0000
+++ b/map.h Fri Jan 07 17:02:43 2005 +0000
@@ -4,6 +4,8 @@
#define TILE_X_BITS 8
#define TILE_Y_BITS 8
+#define TILE_MASK(x) (int)((x) & ((1 << (MapLogX() + MapLogY())) - 1))
+
extern byte _map_type_and_height[];
extern byte _map5[];
extern byte _map3_lo[];
@@ -24,6 +26,20 @@
/* The number of tiles in the map */
static inline uint MapSize(void) { return MapSizeX() * MapSizeY(); }
+
+typedef uint16 TileIndex;
+
+static inline uint TileX(TileIndex tile)
+{
+ return tile & MapMaxX();
+}
+
+static inline uint TileY(TileIndex tile)
+{
+ return tile >> MapLogX();
+}
+
+
typedef int16 TileIndexDiff;
typedef struct TileIndexDiffC {
--- a/misc.c Fri Jan 07 12:33:28 2005 +0000
+++ b/misc.c Fri Jan 07 17:02:43 2005 +0000
@@ -527,21 +527,21 @@
// distance in Manhattan metric
uint GetTileDist(TileIndex xy1, TileIndex xy2)
{
- return myabs(GET_TILE_X(xy1) - GET_TILE_X(xy2)) +
- myabs(GET_TILE_Y(xy1) - GET_TILE_Y(xy2));
+ return myabs(TileX(xy1) - TileX(xy2)) +
+ myabs(TileY(xy1) - TileY(xy2));
}
// maximum distance in x _or_ y
uint GetTileDist1D(TileIndex xy1, TileIndex xy2)
{
- return max(myabs(GET_TILE_X(xy1) - GET_TILE_X(xy2)),
- myabs(GET_TILE_Y(xy1) - GET_TILE_Y(xy2)));
+ return max(myabs(TileX(xy1) - TileX(xy2)),
+ myabs(TileY(xy1) - TileY(xy2)));
}
uint GetTileDist1Db(TileIndex xy1, TileIndex xy2)
{
- int a = myabs(GET_TILE_X(xy1) - GET_TILE_X(xy2));
- int b = myabs(GET_TILE_Y(xy1) - GET_TILE_Y(xy2));
+ int a = myabs(TileX(xy1) - TileX(xy2));
+ int b = myabs(TileY(xy1) - TileY(xy2));
if (a > b)
return a*2+b;
@@ -551,15 +551,15 @@
uint GetTileDistAdv(TileIndex xy1, TileIndex xy2)
{
- uint a = myabs(GET_TILE_X(xy1) - GET_TILE_X(xy2));
- uint b = myabs(GET_TILE_Y(xy1) - GET_TILE_Y(xy2));
+ uint a = myabs(TileX(xy1) - TileX(xy2));
+ uint b = myabs(TileY(xy1) - TileY(xy2));
return a*a+b*b;
}
bool CheckDistanceFromEdge(TileIndex tile, uint distance)
{
- return IS_INT_INSIDE(GET_TILE_X(tile), distance, MapSizeX() - distance) &&
- IS_INT_INSIDE(GET_TILE_Y(tile), distance, MapSizeY() - distance);
+ return IS_INT_INSIDE(TileX(tile), distance, MapSizeX() - distance) &&
+ IS_INT_INSIDE(TileY(tile), distance, MapSizeY() - distance);
}
void OnNewDay_Train(Vehicle *v);
@@ -732,8 +732,8 @@
extern uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, int line)
{
- uint x = GET_TILE_X(tile) + (signed char)(add & 0xFF);
- uint y = GET_TILE_Y(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80);
+ uint x = TileX(tile) + (signed char)(add & 0xFF);
+ uint y = TileY(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80);
if (x >= MapSizeX() || y >= MapSizeY()) {
char buf[512];
--- a/misc_gui.c Fri Jan 07 12:33:28 2005 +0000
+++ b/misc_gui.c Fri Jan 07 17:02:43 2005 +0000
@@ -58,8 +58,8 @@
DrawStringCentered(140, 38, str, 0);
snprintf(_userstring, USERSTRING_LEN, "%.4X", lid->tile);
- SetDParam(0, GET_TILE_X(lid->tile));
- SetDParam(1, GET_TILE_Y(lid->tile));
+ SetDParam(0, TileX(lid->tile));
+ SetDParam(1, TileY(lid->tile));
SetDParam(2, STR_SPEC_USERSTRING);
DrawStringCentered(140, 49, STR_LANDINFO_COORDS, 0);
@@ -143,7 +143,7 @@
GetTileDesc(tile, &lid.td);
#if defined(_DEBUG)
- DEBUG(misc, 0) ("TILE: %#x (%i,%i)", tile, GET_TILE_X(tile), GET_TILE_Y(tile));
+ DEBUG(misc, 0) ("TILE: %#x (%i,%i)", tile, TileX(tile), TileY(tile));
DEBUG(misc, 0) ("TILE: %d ", tile);
DEBUG(misc, 0) ("_map_type_and_height=%#x", _map_type_and_height[tile]);
DEBUG(misc, 0) ("_map2=%#x", _map2[tile]);
--- a/pathfind.c Fri Jan 07 12:33:28 2005 +0000
+++ b/pathfind.c Fri Jan 07 17:02:43 2005 +0000
@@ -161,7 +161,7 @@
if (bits == 0)
return;
- assert(GET_TILE_X(tile) != MapMaxX() && GET_TILE_Y(tile) != MapMaxY());
+ assert(TileX(tile) != MapMaxX() && TileY(tile) != MapMaxY());
if ( (bits & (bits - 1)) == 0 ) {
/* only one direction */
@@ -218,8 +218,8 @@
flotr.length = 0;
- x = GET_TILE_X(tile) * 16;
- y = GET_TILE_Y(tile) * 16;
+ x = TileX(tile) * 16;
+ y = TileY(tile) * 16;
z = GetSlopeZ(x+8, y+8);
--- a/pathfind.h Fri Jan 07 12:33:28 2005 +0000
+++ b/pathfind.h Fri Jan 07 17:02:43 2005 +0000
@@ -14,7 +14,7 @@
* 0 0 y7 y6 y5 y4 y3 y2 y1 y0 x4 x3 x2 x1 x0 0
* 0 0 0 0 y5 y4 y3 y2 y1 y0 x4 x3 x2 x1 x0 0
*/
-#define PATHFIND_HASH_TILE(tile) (GET_TILE_X(tile) & 0x1F) + ((GET_TILE_Y(tile)&0x1F)<<5)
+#define PATHFIND_HASH_TILE(tile) (TileX(tile) & 0x1F) + ((TileY(tile) & 0x1F) << 5)
typedef struct TrackPathFinderLink {
TileIndex tile;
--- a/rail_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/rail_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -983,8 +983,8 @@
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
/* unpack end tile */
- ex = GET_TILE_X(p1)*16;
- ey = GET_TILE_Y(p1)*16;
+ ex = TileX(p1) * 16;
+ ey = TileY(p1) * 16;
railbit = _railbit.initial[((p2 >> 4)&0xF) + (x > ex ? 4 : 0) + (y > ey ? 8 : 0)];
@@ -1144,8 +1144,8 @@
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
// make sure sx,sy are smaller than ex,ey
- sx = GET_TILE_X(p1)*16;
- sy = GET_TILE_Y(p1)*16;
+ sx = TileX(p1) * 16;
+ sy = TileY(p1) * 16;
if (ex < sx) intswap(ex, sx);
if (ey < sy) intswap(ey, sy);
--- a/rail_gui.c Fri Jan 07 12:33:28 2005 +0000
+++ b/rail_gui.c Fri Jan 07 17:02:43 2005 +0000
@@ -819,10 +819,10 @@
static void HandleStationPlacement(uint start, uint end)
{
- uint sx = GET_TILE_X(start);
- uint sy = GET_TILE_Y(start);
- uint ex = GET_TILE_X(end);
- uint ey = GET_TILE_Y(end);
+ uint sx = TileX(start);
+ uint sy = TileY(start);
+ uint ex = TileX(end);
+ uint ey = TileY(end);
uint w,h;
if (sx > ex) intswap(sx,ex);
--- a/road_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/road_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -980,8 +980,8 @@
SndPlayTileFx(SND_21_JACKHAMMER, tile);
CreateEffectVehicleAbove(
- GET_TILE_X(tile) * 16 + 7,
- GET_TILE_Y(tile) * 16 + 7,
+ TileX(tile) * 16 + 7,
+ TileY(tile) * 16 + 7,
0,
EV_ROADWORK);
MarkTileDirtyByTile(tile);
--- a/roadveh_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/roadveh_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -138,8 +138,8 @@
v->owner = _current_player;
v->tile = tile;
- x = GET_TILE_X(tile)*16 + 8;
- y = GET_TILE_Y(tile)*16 + 8;
+ x = TileX(tile) * 16 + 8;
+ y = TileY(tile) * 16 + 8;
v->x_pos = x;
v->y_pos = y;
v->z_pos = GetSlopeZ(x,y);
@@ -1107,8 +1107,8 @@
rd2 = _roadveh_data_2[dir];
rdp = _road_drive_data[(_opt.road_side<<4) + rd2];
- x = GET_TILE_X(v->tile)*16 + (rdp[6].x&0xF);
- y = GET_TILE_Y(v->tile)*16 + (rdp[6].y&0xF);
+ x = TileX(v->tile) * 16 + (rdp[6].x & 0xF);
+ y = TileY(v->tile) * 16 + (rdp[6].y & 0xF);
if (RoadVehFindCloseTo(v,x,y,v->direction))
return;
@@ -1192,8 +1192,8 @@
tmp &= ~0x10;
- x = GET_TILE_X(tile)*16 + rdp[0].x;
- y = GET_TILE_Y(tile)*16 + rdp[0].y;
+ x = TileX(tile) * 16 + rdp[0].x;
+ y = TileY(tile) * 16 + rdp[0].y;
if (RoadVehFindCloseTo(v, x, y, newdir=RoadVehGetSlidingDirection(v, x, y)))
return;
@@ -1254,8 +1254,8 @@
tmp = (_opt.road_side<<4) + dir;
rdp = _road_drive_data[tmp];
- x = GET_TILE_X(v->tile)*16 + rdp[1].x;
- y = GET_TILE_Y(v->tile)*16 + rdp[1].y;
+ x = TileX(v->tile) * 16 + rdp[1].x;
+ y = TileY(v->tile) * 16 + rdp[1].y;
if (RoadVehFindCloseTo(v, x, y, newdir=RoadVehGetSlidingDirection(v, x, y)))
return;
--- a/ship_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/ship_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -569,8 +569,8 @@
static int ShipGetNewDirectionFromTiles(uint new_tile, uint old_tile)
{
- uint offs = (GET_TILE_Y(new_tile) - GET_TILE_Y(old_tile) + 1) * 4 +
- GET_TILE_X(new_tile) - GET_TILE_X(old_tile) + 1;
+ uint offs = (TileY(new_tile) - TileY(old_tile) + 1) * 4 +
+ TileX(new_tile) - TileX(old_tile) + 1;
assert(offs < 11 && offs != 3 && offs != 7);
return _new_vehicle_direction_table[offs];
}
@@ -711,9 +711,8 @@
}
} else {
// new tile
- if (GET_TILE_X(gp.new_tile) == 0xFF ||
- (byte)GET_TILE_Y(gp.new_tile) == 0xFF)
- goto reverse_direction;
+ if (TileX(gp.new_tile) == MapMaxX() || TileY(gp.new_tile) == MapMaxY())
+ goto reverse_direction;
dir = ShipGetNewDirectionFromTiles(gp.new_tile, gp.old_tile);
assert(dir == 1 || dir == 3 || dir == 5 || dir == 7);
@@ -828,8 +827,8 @@
v->owner = _current_player;
v->tile = tile;
- x = GET_TILE_X(tile)*16 + 8;
- y = GET_TILE_Y(tile)*16 + 8;
+ x = TileX(tile) * 16 + 8;
+ y = TileY(tile) * 16 + 8;
v->x_pos = x;
v->y_pos = y;
v->z_pos = GetSlopeZ(x,y);
--- a/smallmap_gui.c Fri Jan 07 12:33:28 2005 +0000
+++ b/smallmap_gui.c Fri Jan 07 17:02:43 2005 +0000
@@ -750,8 +750,8 @@
if (t->xy != 0) {
// Remap the town coordinate
Point pt = RemapCoords(
- (int)(GET_TILE_X(t->xy)*16 - WP(w,smallmap_d).scroll_x) >> 4,
- (int)(GET_TILE_Y(t->xy)*16 - WP(w,smallmap_d).scroll_y) >> 4,
+ (int)(TileX(t->xy) * 16 - WP(w,smallmap_d).scroll_x) >> 4,
+ (int)(TileY(t->xy) * 16 - WP(w,smallmap_d).scroll_y) >> 4,
0);
x = pt.x - WP(w,smallmap_d).subscroll + 3 - (t->sign.width_2 >> 1);
y = pt.y;
--- a/sound.c Fri Jan 07 12:33:28 2005 +0000
+++ b/sound.c Fri Jan 07 17:02:43 2005 +0000
@@ -331,8 +331,8 @@
void SndPlayTileFx(SoundFx sound, TileIndex tile)
{
/* emits sound from center (+ 8) of the tile */
- int x = GET_TILE_X(tile) * 16 + 8;
- int y = GET_TILE_Y(tile) * 16 + 8;
+ int x = TileX(tile) * 16 + 8;
+ int y = TileY(tile) * 16 + 8;
Point pt = RemapCoords(x, y, GetSlopeZ(x, y));
SndPlayScreenCoordFx(sound, pt.x, pt.y);
}
--- a/station_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/station_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -111,19 +111,19 @@
{
uint16 station_index = st->index;
uint i;
- uint x1 = GET_TILE_X(tile);
- uint y1 = GET_TILE_Y(tile);
+ uint x1 = TileX(tile);
+ uint y1 = TileY(tile);
uint x2 = x1 + w - 1;
uint y2 = y1 + h - 1;
uint t;
for (i = 0; i != MapSize(); i++) {
if (IS_TILETYPE(i, MP_STATION) && _map2[i] == station_index) {
- t = GET_TILE_X(i);
+ t = TileX(i);
if (t < x1) x1 = t;
if (t > x2) x2 = t;
- t = GET_TILE_Y(i);
+ t = TileY(i);
if (t < y1) y1 = t;
if (t > y2) y2 = t;
}
@@ -286,8 +286,8 @@
};
free_names &= _direction_and_table[
- (GET_TILE_X(tile) < GET_TILE_X(t->xy)) +
- (GET_TILE_Y(tile) < GET_TILE_Y(t->xy))*2];
+ (TileX(tile) < TileX(t->xy)) +
+ (TileY(tile) < TileY(t->xy)) * 2];
}
tmp = free_names & ((1<<1)|(1<<2)|(1<<3)|(1<<4)|(1<<6)|(1<<7)|(1<<12)|(1<<26)|(1<<27)|(1<<28)|(1<<29)|(1<<30));
@@ -350,7 +350,7 @@
// st = Station to update for.
static void UpdateStationVirtCoord(Station *st)
{
- Point pt = RemapCoords2(GET_TILE_X(st->xy) * 16, GET_TILE_Y(st->xy) * 16);
+ Point pt = RemapCoords2(TileX(st->xy) * 16, TileY(st->xy) * 16);
pt.y -= 32;
if (st->facilities&FACIL_AIRPORT && st->airport_type==AT_OILRIG) pt.y -= 16;
@@ -412,8 +412,8 @@
memset(produced, 0, NUM_CARGO * sizeof(uint));
- x = GET_TILE_X(tile);
- y = GET_TILE_Y(tile);
+ x = TileX(tile);
+ y = TileY(tile);
// expand the region by 4 tiles on each side
// while making sure that we remain inside the board.
@@ -460,8 +460,8 @@
memset(accepts, 0, sizeof(AcceptedCargo));
- x = GET_TILE_X(tile);
- y = GET_TILE_Y(tile);
+ x = TileX(tile);
+ y = TileY(tile);
// expand the region by 4 tiles on each side
// while making sure that we remain inside the board.
@@ -531,10 +531,10 @@
for(i=0; i!=7; i++) {
uint tile = span[i];
if (tile) {
- min_x = min(min_x,GET_TILE_X(tile));
- max_x = max(max_x,GET_TILE_X(tile));
- min_y = min(min_y,GET_TILE_Y(tile));
- max_y = max(max_y,GET_TILE_Y(tile));
+ min_x = min(min_x, TileX(tile));
+ max_x = max(max_x, TileX(tile));
+ min_y = min(min_y, TileY(tile));
+ max_y = max(max_y, TileY(tile));
}
}
if (_patches.modified_catchment) {
@@ -677,10 +677,10 @@
if (_patches.nonuniform_stations) {
// determine new size of train station region..
- int x = min(GET_TILE_X(st->train_tile), GET_TILE_X(tile));
- int y = min(GET_TILE_Y(st->train_tile), GET_TILE_Y(tile));
- curw = max(GET_TILE_X(st->train_tile) + curw, GET_TILE_X(tile) + w) - x;
- curh = max(GET_TILE_Y(st->train_tile) + curh, GET_TILE_Y(tile) + h) - y;
+ int x = min(TileX(st->train_tile), TileX(tile));
+ int y = min(TileY(st->train_tile), TileY(tile));
+ curw = max(TileX(st->train_tile) + curw, TileX(tile) + w) - x;
+ curh = max(TileY(st->train_tile) + curh, TileY(tile) + h) - y;
tile = TILE_XY(x,y);
} else {
// check so the direction is the same
--- a/town_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/town_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -186,7 +186,7 @@
Point pt;
MarkTownSignDirty(t);
- pt = RemapCoords2(GET_TILE_X(t->xy)*16, GET_TILE_Y(t->xy)*16);
+ pt = RemapCoords2(TileX(t->xy) * 16, TileY(t->xy) * 16);
SetDParam(0, t->townnametype);
SetDParam(1, t->townnameparts);
SetDParam(2, t->population);
--- a/train_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/train_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -266,8 +266,8 @@
v->direction = (byte)(dir*2+1);
v->tile = (TileIndex)tile;
- x = GET_TILE_X(tile)*16 | _vehicle_initial_x_fract[dir];
- y = GET_TILE_Y(tile)*16 | _vehicle_initial_y_fract[dir];
+ x = TileX(tile) * 16 | _vehicle_initial_x_fract[dir];
+ y = TileY(tile) * 16 | _vehicle_initial_y_fract[dir];
v->x_pos = x;
v->y_pos = y;
@@ -1846,8 +1846,8 @@
static int GetNewVehicleDirectionByTile(uint new_tile, uint old_tile)
{
- uint offs = (GET_TILE_Y(new_tile) - GET_TILE_Y(old_tile) + 1) * 4 +
- GET_TILE_X(new_tile) - GET_TILE_X(old_tile) + 1;
+ uint offs = (TileY(new_tile) - TileY(old_tile) + 1) * 4 +
+ TileX(new_tile) - TileX(old_tile) + 1;
assert(offs < 11);
return _new_vehicle_direction_table[offs];
}
--- a/tree_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/tree_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -155,8 +155,8 @@
SET_EXPENSES_TYPE(EXPENSES_OTHER);
// make sure sx,sy are smaller than ex,ey
- sx = GET_TILE_X(p2)*16;
- sy = GET_TILE_Y(p2)*16;
+ sx = TileX(p2) * 16;
+ sy = TileY(p2) * 16;
if (ex < sx) intswap(ex, sx);
if (ey < sy) intswap(ey, sy);
--- a/tunnelbridge_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/tunnelbridge_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -134,10 +134,10 @@
uint32 GetBridgeLength(TileIndex begin, TileIndex end)
{
int x1, y1, x2, y2; // coordinates of starting and end tiles
- x1 = GET_TILE_X(begin);
- y1 = GET_TILE_Y(begin);
- x2 = GET_TILE_X(end);
- y2 = GET_TILE_Y(end);
+ x1 = TileX(begin);
+ y1 = TileY(begin);
+ x2 = TileX(end);
+ y2 = TileY(end);
return abs((x2 + y2 - x1 - y1)) - 1;
}
@@ -190,8 +190,8 @@
rail_or_road = 0;
}
- sx = GET_TILE_X(p1) * 16;
- sy = GET_TILE_Y(p1) * 16;
+ sx = TileX(p1) * 16;
+ sy = TileY(p1) * 16;
direction = 0;
--- a/unmovable_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/unmovable_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -236,7 +236,7 @@
{
uint tile_s;
- tile_s = TILE_XY( (int) GET_TILE_X(tile)-4, (int) GET_TILE_Y(tile)-4 );
+ tile_s = TILE_XY(TileX(tile) - 4, TileY(tile) - 4);
BEGIN_TILE_LOOP(tile, 9, 9, tile_s)
// already a radio tower here?
@@ -324,7 +324,9 @@
return CMD_ERROR;
if (p1)
- cost = DoCommand(GET_TILE_X(p->location_of_house)*16, GET_TILE_Y(p->location_of_house)*16, p1&0xFF, 0, flags, CMD_DESTROY_COMPANY_HQ);
+ cost = DoCommand(
+ TileX(p->location_of_house) * 16, TileY(p->location_of_house) * 16,
+ p1 & 0xFF, 0, flags, CMD_DESTROY_COMPANY_HQ);
if (flags & DC_EXEC) {
score = UpdateCompanyRatingAndValue(p, false);
--- a/vehicle.c Fri Jan 07 12:33:28 2005 +0000
+++ b/vehicle.c Fri Jan 07 17:02:43 2005 +0000
@@ -105,10 +105,10 @@
Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z)
{
- int x1 = GET_TILE_X(from);
- int y1 = GET_TILE_Y(from);
- int x2 = GET_TILE_X(to);
- int y2 = GET_TILE_Y(to);
+ int x1 = TileX(from);
+ int y1 = TileY(from);
+ int x2 = TileX(to);
+ int y2 = TileY(to);
Vehicle *veh;
/* Make sure x1 < x2 or y1 < y2 */
@@ -148,7 +148,7 @@
void UpdateWaypointSign(Waypoint *cp)
{
- Point pt = RemapCoords2(GET_TILE_X(cp->xy)*16, GET_TILE_Y(cp->xy)*16);
+ Point pt = RemapCoords2(TileX(cp->xy) * 16, TileY(cp->xy) * 16);
SetDParam(0, cp - _waypoints);
UpdateViewportSignPos(&cp->sign, pt.x, pt.y - 0x20, STR_WAYPOINT_VIEWPORT);
}
@@ -263,7 +263,7 @@
{
int x,y,x2,y2;
VehicleID veh;
- Point pt = RemapCoords(GET_TILE_X(tile) * 16, GET_TILE_Y(tile) * 16, 0);
+ Point pt = RemapCoords(TileX(tile) * 16, TileY(tile) * 16, 0);
x2 = ((pt.x + 104) & 0x1F80) >> 7;
x = ((pt.x - 174) & 0x1F80) >> 7;
--- a/viewport.c Fri Jan 07 12:33:28 2005 +0000
+++ b/viewport.c Fri Jan 07 17:02:43 2005 +0000
@@ -119,8 +119,8 @@
veh = GetVehicle(WP(w,vp_d).follow_vehicle);
pt = MapXYZToViewport(vp, veh->x_pos, veh->y_pos, veh->z_pos);
} else {
- int x = GET_TILE_X(follow_flags) * 16;
- int y = GET_TILE_Y(follow_flags) * 16;
+ int x = TileX(follow_flags) * 16;
+ int y = TileY(follow_flags) * 16;
WP(w,vp_d).follow_vehicle = 0xFFFF;
z = GetSlopeZ(x,y);
pt = MapXYZToViewport(vp, x,y, z);
@@ -1363,7 +1363,7 @@
}
void MarkTileDirtyByTile(TileIndex tile) {
- Point pt = RemapCoords(GET_TILE_X(tile) * 16, GET_TILE_Y(tile) * 16, GetTileZ(tile));
+ Point pt = RemapCoords(TileX(tile) * 16, TileY(tile) * 16, GetTileZ(tile));
MarkAllViewportsDirty(
pt.x - 31,
pt.y - 122,
@@ -1747,7 +1747,7 @@
/* scrolls the viewport in a window to a given tile */
bool ScrollWindowToTile(TileIndex tile, Window * w)
{
- return ScrollWindowTo(GET_TILE_X(tile)*16+8, GET_TILE_Y(tile)*16+8, w);
+ return ScrollWindowTo(TileX(tile) * 16 + 8, TileY(tile) * 16 + 8, w);
}
@@ -1772,7 +1772,7 @@
bool ScrollMainWindowToTile(TileIndex tile)
{
- return ScrollMainWindowTo(GET_TILE_X(tile)*16+8, GET_TILE_Y(tile)*16+8);
+ return ScrollMainWindowTo(TileX(tile) * 16 + 8, TileY(tile) * 16 + 8);
}
void SetRedErrorSquare(TileIndex tile)
@@ -1872,10 +1872,10 @@
thd = _thd_ptr;
thd->userdata = user;
- thd->selend.x = GET_TILE_X(tile)*16;
- thd->selstart.x = GET_TILE_X(tile)*16;
- thd->selend.y = GET_TILE_Y(tile)*16;
- thd->selstart.y = GET_TILE_Y(tile)*16;
+ thd->selend.x = TileX(tile) * 16;
+ thd->selstart.x = TileX(tile) * 16;
+ thd->selend.y = TileY(tile) * 16;
+ thd->selstart.y = TileY(tile) * 16;
if (thd->place_mode == 1) {
thd->place_mode = 3;
thd->next_drawstyle = HT_RECT;
@@ -1894,10 +1894,10 @@
void VpSetPresizeRange(uint from, uint to)
{
TileHighlightData *thd = _thd_ptr;
- thd->selend.x = GET_TILE_X(to)*16;
- thd->selend.y = GET_TILE_Y(to)*16;
- thd->selstart.x = GET_TILE_X(from)*16;
- thd->selstart.y = GET_TILE_Y(from)*16;
+ thd->selend.x = TileX(to) * 16;
+ thd->selend.y = TileY(to) * 16;
+ thd->selstart.x = TileX(from) * 16;
+ thd->selstart.y = TileY(from) * 16;
thd->next_drawstyle = HT_RECT;
}
--- a/water_cmd.c Fri Jan 07 12:33:28 2005 +0000
+++ b/water_cmd.c Fri Jan 07 17:02:43 2005 +0000
@@ -197,7 +197,7 @@
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
// move in which direction?
- delta = (GET_TILE_X(tile) == GET_TILE_X(endtile)) ? TILE_XY(0,1) : TILE_XY(1,0);
+ delta = (TileX(tile) == TileX(endtile)) ? TILE_XY(0,1) : TILE_XY(1,0);
if (endtile < tile) delta = -delta;
cost = 0;
@@ -267,8 +267,8 @@
return CMD_ERROR;
// Make sure it's not an edge tile.
- if (!(IS_INT_INSIDE(GET_TILE_X(tile), 1, MapMaxX() - 1) &&
- IS_INT_INSIDE(GET_TILE_Y(tile), 1, MapMaxY() - 1)))
+ if (!(IS_INT_INSIDE(TileX(tile), 1, MapMaxX() - 1) &&
+ IS_INT_INSIDE(TileY(tile), 1, MapMaxY() - 1)))
return_cmd_error(STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP);
if (m5 == 0) {
@@ -582,8 +582,8 @@
{{ 0, -1}, {0, 0}, {1, 0}, { 0, -1}, { 1, -1}}
};
- if (IS_INT_INSIDE(GET_TILE_X(tile), 1, MapSizeX() - 3 + 1) &&
- IS_INT_INSIDE(GET_TILE_Y(tile), 1, MapSizeY() - 3 + 1)) {
+ if (IS_INT_INSIDE(TileX(tile), 1, MapSizeX() - 3 + 1) &&
+ IS_INT_INSIDE(TileY(tile), 1, MapSizeY() - 3 + 1)) {
for(i=0; i!=4; i++)
TileLoopWaterHelper(tile, _tile_loop_offs_array[i]);
}
@@ -592,16 +592,16 @@
_current_player = OWNER_NONE;
// edges
- if (GET_TILE_X(tile) == 0 && IS_INT_INSIDE(GET_TILE_Y(tile), 1, MapSizeY() - 3 + 1)) //NE
+ if (TileX(tile) == 0 && IS_INT_INSIDE(TileY(tile), 1, MapSizeY() - 3 + 1)) //NE
TileLoopWaterHelper(tile, _tile_loop_offs_array[2]);
- if (GET_TILE_X(tile) == (MapSizeX() - 2) && IS_INT_INSIDE(GET_TILE_Y(tile), 1, MapSizeY() - 3 + 1)) //SW
+ if (TileX(tile) == (MapSizeX() - 2) && IS_INT_INSIDE(TileY(tile), 1, MapSizeY() - 3 + 1)) //SW
TileLoopWaterHelper(tile, _tile_loop_offs_array[0]);
- if (GET_TILE_Y(tile) == 0 && IS_INT_INSIDE(GET_TILE_X(tile), 1, MapSizeX() - 3 + 1)) //NW
+ if (TileY(tile) == 0 && IS_INT_INSIDE(TileX(tile), 1, MapSizeX() - 3 + 1)) //NW
TileLoopWaterHelper(tile, _tile_loop_offs_array[1]);
- if (GET_TILE_Y(tile) == (MapSizeY() - 2) && IS_INT_INSIDE(GET_TILE_X(tile), 1, MapSizeX() - 3 + 1)) //SE
+ if (TileY(tile) == (MapSizeY() - 2) && IS_INT_INSIDE(TileX(tile), 1, MapSizeX() - 3 + 1)) //SE
TileLoopWaterHelper(tile, _tile_loop_offs_array[3]);
}