petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.

Browse Source
This commit is contained in:
rubidium
2007-05-02 18:29:11 +00:00
parent e4dc1f460b
commit 981bf52bdd
8 changed files with 44 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ship_cmd.cpp
View File

@@ -306,15 +306,8 @@ static void HandleShipLoading(Vehicle *v)
case OT_LOADING: {
if (--v->load_unload_time_rem != 0) return;
if (CanFillVehicle(v) && (
v->current_order.flags & OF_FULL_LOAD ||
(_patches.gradual_loading && !HASBIT(v->vehicle_flags, VF_LOADING_FINISHED))
)) {
SET_EXPENSES_TYPE(EXPENSES_SHIP_INC);
if (LoadUnloadVehicle(v, false)) {
InvalidateWindow(WC_SHIPS_LIST, v->owner);
v->MarkDirty();
}
if (CanFillVehicle(v)) {
LoadUnloadVehicle(v);
return;
}
PlayShipSound(v);