Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -637,7 +637,7 @@ CommandCost CmdPlantTree(DoCommandFlags flags, TileIndex tile, TileIndex start_t
|
||||
}
|
||||
|
||||
struct TreeListEnt : PalSpriteID {
|
||||
uint8_t x, y;
|
||||
int8_t x, y;
|
||||
};
|
||||
|
||||
static void DrawTile_Trees(TileInfo *ti)
|
||||
@@ -703,7 +703,8 @@ static void DrawTile_Trees(TileInfo *ti)
|
||||
}
|
||||
}
|
||||
|
||||
AddSortableSpriteToDraw(te[mi].sprite, te[mi].pal != PAL_NONE ? te[mi].pal : shade_pal, ti->x + te[mi].x, ti->y + te[mi].y, 16 - te[mi].x, 16 - te[mi].y, 0x30, z, IsTransparencySet(TO_TREES), -te[mi].x, -te[mi].y);
|
||||
SpriteBounds bounds{{}, {TILE_SIZE, TILE_SIZE, 48}, {te[mi].x, te[mi].y, 0}};
|
||||
AddSortableSpriteToDraw(te[mi].sprite, te[mi].pal != PAL_NONE ? te[mi].pal : shade_pal, ti->x, ti->y, z, bounds, IsTransparencySet(TO_TREES));
|
||||
|
||||
/* replace the removed one with the last one */
|
||||
te[mi] = te[trees - 1];
|
||||
@@ -1034,4 +1035,5 @@ extern const TileTypeProcs _tile_type_trees_procs = {
|
||||
nullptr, // vehicle_enter_tile_proc
|
||||
GetFoundation_Trees, // get_foundation_proc
|
||||
TerraformTile_Trees, // terraform_tile_proc
|
||||
nullptr, // check_build_above_proc
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user