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

(svn r9772) -Fix [r9770,FS#761]: under some circumstances loading/unloading didn't work (correctly).

This commit is contained in:
rubidium 2007-05-03 11:02:37 +00:00
parent c584b7a401
commit 9194d5ab9e
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/vehicle.cpp
View File

@ -743,27 +743,30 @@ static bool CanFillVehicle_FullLoadAny(Vehicle *v)
}
bool CanFillVehicle(Vehicle *v)
bool CanFillVehicle(Vehicle *front_v)
{
TileIndex tile = v->tile;
TileIndex tile = front_v->tile;
if (IsTileType(tile, MP_STATION) ||
(v->type == VEH_SHIP && (
assert(IsTileType(tile, MP_STATION) ||
(front_v->type == VEH_SHIP && (
IsTileType(TILE_ADDXY(tile, 1, 0), MP_STATION) ||
IsTileType(TILE_ADDXY(tile, -1, 0), MP_STATION) ||
IsTileType(TILE_ADDXY(tile, 0, 1), MP_STATION) ||
IsTileType(TILE_ADDXY(tile, 0, -1), MP_STATION) ||
IsTileType(TILE_ADDXY(tile, -2, 0), MP_STATION)
))) {
)));
/* If patch is active, use alternative CanFillVehicle-function */
if (_patches.full_load_any && v->current_order.flags & OF_FULL_LOAD) return CanFillVehicle_FullLoadAny(v);
bool full_load = front_v->current_order.flags & OF_FULL_LOAD;
do {
if (v->cargo_count != v->cargo_cap) return true;
} while ((v = v->next) != NULL);
}
return false;
/* If patch is active, use alternative CanFillVehicle-function */
if (_patches.full_load_any && full_load) return CanFillVehicle_FullLoadAny(front_v);
Vehicle *v = front_v;
do {
if (HASBIT(v->vehicle_flags, VF_CARGO_UNLOADING) || (full_load && v->cargo_count != v->cargo_cap)) return true;
} while ((v = v->next) != NULL);
return !HASBIT(front_v->vehicle_flags, VF_LOADING_FINISHED);
}
/** Check if a given engine type can be refitted to a given cargo