Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r2628) - Fix: Planting trees does not result in a MapSize() assertion anymore; introduced in r2598

Browse Source
This commit is contained in:
Darkvater 2005-07-18 00:17:19 +00:00
parent e52443ebc1
commit 5695330940
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tree_cmd.c
View File

@ -132,10 +132,7 @@ void GenerateTrees(void)
int32 CmdPlantTree(int ex, int ey, uint32 flags, uint32 p1, uint32 p2) int32 CmdPlantTree(int ex, int ey, uint32 flags, uint32 p1, uint32 p2)
{ {
int32 cost; int32 cost;
int sx; int sx, sy, x, y;
int sy;
int x;
int y;
if (p2 > MapSize()) return CMD_ERROR; if (p2 > MapSize()) return CMD_ERROR;
/* Check the tree type. It can be random or some valid value within the current climate */ /* Check the tree type. It can be random or some valid value within the current climate */
@ -144,15 +141,16 @@ int32 CmdPlantTree(int ex, int ey, uint32 flags, uint32 p1, uint32 p2)
SET_EXPENSES_TYPE(EXPENSES_OTHER); SET_EXPENSES_TYPE(EXPENSES_OTHER);
// make sure sx,sy are smaller than ex,ey // make sure sx,sy are smaller than ex,ey
sx = TileX(p2) * 16; sx = TileX(p2);
sy = TileY(p2) * 16; sy = TileY(p2);
ex /= 16; ey /= 16;
if (ex < sx) intswap(ex, sx); if (ex < sx) intswap(ex, sx);
if (ey < sy) intswap(ey, sy); if (ey < sy) intswap(ey, sy);
cost = 0; // total cost cost = 0; // total cost
for (x = sx; x <= ex; x += 16) { for (x = sx; x <= ex; x++) {
for (y = sy; y <= ey; y += 16) { for (y = sy; y <= ey; y++) {
TileIndex tile = TileXY(x, y); TileIndex tile = TileXY(x, y);
if (!EnsureNoVehicle(tile)) continue; if (!EnsureNoVehicle(tile)) continue;