diff options
| -rw-r--r-- | rail_cmd.c | 8 | ||||
| -rw-r--r-- | tree_cmd.c | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/rail_cmd.c b/rail_cmd.c index 5943092ad..c9d6cd2f6 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -269,7 +269,6 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2) { TileIndex tile; uint tileh; - uint m5; /* XXX: Used only as a cache, should probably be removed? */ Track track = (Track)p2; TrackBits trackbit; int32 cost = 0; @@ -279,7 +278,6 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2) tile = TileVirtXY(x, y); tileh = GetTileSlope(tile, NULL); - m5 = _m[tile].m5; trackbit = TrackToTrackBits(track); SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); @@ -326,7 +324,7 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (flags & DC_EXEC) { _m[tile].m2 &= ~RAIL_MAP2LO_GROUND_MASK; // Bare land - _m[tile].m5 = m5 | trackbit; + _m[tile].m5 |= trackbit; } break; @@ -341,8 +339,8 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (!EnsureNoVehicle(tile)) return CMD_ERROR; if (GetRoadType(tile) == ROAD_NORMAL && ( - (track == TRACK_X && m5 == ROAD_Y) || - (track == TRACK_Y && m5 == ROAD_X) // correct direction? + (track == TRACK_X && GetRoadBits(tile) == ROAD_Y) || + (track == TRACK_Y && GetRoadBits(tile) == ROAD_X) )) { if (flags & DC_EXEC) { MakeRoadCrossing(tile, GetTileOwner(tile), _current_player, (track == TRACK_X ? AXIS_Y : AXIS_X), p1, _m[tile].m2); diff --git a/tree_cmd.c b/tree_cmd.c index 7a699efdb..be6b3d5ca 100644 --- a/tree_cmd.c +++ b/tree_cmd.c @@ -286,9 +286,9 @@ static void DrawTile_Trees(TileInfo *ti) uint i; /* put the trees to draw in a list */ - i = (ti->map5 >> 6) + 1; + i = GetTreeCount(ti->tile) + 1; do { - uint32 image = s[0] + (--i == 0 ? GB(ti->map5, 0, 3) : 3); + uint32 image = s[0] + (--i == 0 ? GetTreeGrowth(ti->tile) : 3); if (_display_opt & DO_TRANS_BUILDINGS) MAKE_TRANSPARENT(image); te[i].image = image; te[i].x = d->x; @@ -302,7 +302,7 @@ static void DrawTile_Trees(TileInfo *ti) byte min = 0xFF; TreeListEnt *tep = NULL; - i = (ti->map5 >> 6) + 1; + i = GetTreeCount(ti->tile) + 1; do { if (te[--i].image != 0 && te[i].x + te[i].y < min) { min = te[i].x + te[i].y; |