mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r2109) -Fix: use FindVehicleOnTileZ(tile, 0) over FindVehicleBetween(tile, tile, 0)

This commit is contained in:
truelight 2005-03-30 09:25:20 +00:00
parent d97ff67129
commit 95541fa52d
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vehicle.c
View File

@ -117,6 +117,16 @@ bool EnsureNoVehicleZ(TileIndex tile, byte z)
return VehicleFromPos(tile, &ti, EnsureNoVehicleProcZ) == NULL;
}
Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z)
{
TileInfo ti;
ti.tile = tile;
ti.z = z;
return VehicleFromPos(tile, &ti, EnsureNoVehicleProcZ);
}
Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z)
{
int x1 = TileX(from);

1
vehicle.h
View File

@ -258,6 +258,7 @@ void DeleteVehicle(Vehicle *v);
void DeleteVehicleChain(Vehicle *v);
void *VehicleFromPos(TileIndex tile, void *data, VehicleFromPosProc *proc);
void CallVehicleTicks(void);
Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z);
void InitializeTrains(void);

2
water_cmd.c
View File

@ -532,7 +532,7 @@ static void TileLoopWaterHelper(TileIndex tile, const TileIndexDiffC *offs)
_current_player = OWNER_WATER;
{
Vehicle *v = FindVehicleBetween(target, target, 0);
Vehicle *v = FindVehicleOnTileZ(target, 0);
if (v != NULL) FloodVehicle(v);
}