Changeset - r6568:4082d09c85a9
[Not reviewed]
master
0 1 0
glx - 17 years ago 2007-05-03 17:07:51
glx@openttd.org
(svn r9773) -Fix r9772: MSVC warning
1 file changed with 1 insertions and 1 deletions:
0 comments (0 inline, 0 general)
src/vehicle.cpp
Show inline comments
 
@@ -747,25 +747,25 @@ bool CanFillVehicle(Vehicle *front_v)
 
{
 
	TileIndex tile = front_v->tile;
 

	
 
	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)
 
			)));
 

	
 
	bool full_load = front_v->current_order.flags & OF_FULL_LOAD;
 
	bool full_load = HASBIT(front_v->current_order.flags, OFB_FULL_LOAD);
 

	
 
	/* 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);
 
}
 

	
0 comments (0 inline, 0 general)