diff options
author | celestar <celestar@openttd.org> | 2006-04-03 05:32:11 +0000 |
---|---|---|
committer | celestar <celestar@openttd.org> | 2006-04-03 05:32:11 +0000 |
commit | 6443c14ebd7ed0f9920673c218eaaa1172076a5f (patch) | |
tree | 7d8babf7cbe0b9ecf1ebc12e27848ef54f79d0e3 /roadveh_cmd.c | |
parent | 16c721237bc2ac93b80bb1a22fae1340158b7d71 (diff) | |
download | openttd-6443c14ebd7ed0f9920673c218eaaa1172076a5f.tar.xz |
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
Diffstat (limited to 'roadveh_cmd.c')
-rw-r--r-- | roadveh_cmd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/roadveh_cmd.c b/roadveh_cmd.c index 2ee1a3c72..33473f517 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -141,8 +141,8 @@ int32 CmdBuildRoadVeh(int x, int y, uint32 flags, uint32 p1, uint32 p2) v->owner = _current_player; v->tile = tile; - x = TileX(tile) * 16 + 8; - y = TileY(tile) * 16 + 8; + x = TileX(tile) * TILE_SIZE + 8; + y = TileY(tile) * TILE_SIZE + 8; v->x_pos = x; v->y_pos = y; v->z_pos = GetSlopeZ(x,y); @@ -1211,8 +1211,8 @@ static void RoadVehController(Vehicle *v) rd2 = _roadveh_data_2[dir]; rdp = _road_drive_data[(_opt.road_side << 4) + rd2]; - x = TileX(v->tile) * 16 + (rdp[6].x & 0xF); - y = TileY(v->tile) * 16 + (rdp[6].y & 0xF); + x = TileX(v->tile) * TILE_SIZE + (rdp[6].x & 0xF); + y = TileY(v->tile) * TILE_SIZE + (rdp[6].y & 0xF); if (RoadVehFindCloseTo(v, x, y, v->direction) != NULL) return; @@ -1299,8 +1299,8 @@ again: rdp = _road_drive_data[(dir + (_opt.road_side << 4)) ^ v->u.road.overtaking]; - x = TileX(tile) * 16 + rdp[0].x; - y = TileY(tile) * 16 + rdp[0].y; + x = TileX(tile) * TILE_SIZE + rdp[0].x; + y = TileY(tile) * TILE_SIZE + rdp[0].y; newdir = RoadVehGetSlidingDirection(v, x, y); if (RoadVehFindCloseTo(v, x, y, newdir) != NULL) return; @@ -1360,8 +1360,8 @@ again: tmp = (_opt.road_side << 4) + dir; rdp = _road_drive_data[tmp]; - x = TileX(v->tile) * 16 + rdp[1].x; - y = TileY(v->tile) * 16 + rdp[1].y; + x = TileX(v->tile) * TILE_SIZE + rdp[1].x; + y = TileY(v->tile) * TILE_SIZE + rdp[1].y; newdir = RoadVehGetSlidingDirection(v, x, y); if (RoadVehFindCloseTo(v, x, y, newdir) != NULL) return; |