equal
deleted
inserted
replaced
1601 |
1601 |
1602 for (; v != NULL; v = v->Next()) { |
1602 for (; v != NULL; v = v->Next()) { |
1603 if (v->cargo_cap == 0) continue; |
1603 if (v->cargo_cap == 0) continue; |
1604 |
1604 |
1605 byte load_amount = EngInfo(v->engine_type)->load_amount; |
1605 byte load_amount = EngInfo(v->engine_type)->load_amount; |
|
1606 |
|
1607 /* The default loadamount for mail is 1/4 of the load amount for passengers */ |
|
1608 if (v->type == VEH_AIRCRAFT && !IsNormalAircraft(v)) load_amount = (load_amount + 3) / 4; |
|
1609 |
1606 if (_settings_game.order.gradual_loading && HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_LOAD_AMOUNT)) { |
1610 if (_settings_game.order.gradual_loading && HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_LOAD_AMOUNT)) { |
1607 uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v); |
1611 uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v); |
1608 if (cb_load_amount != CALLBACK_FAILED && GB(cb_load_amount, 0, 8) != 0) load_amount = GB(cb_load_amount, 0, 8); |
1612 if (cb_load_amount != CALLBACK_FAILED && GB(cb_load_amount, 0, 8) != 0) load_amount = GB(cb_load_amount, 0, 8); |
1609 } |
1613 } |
1610 |
1614 |