equal
deleted
inserted
replaced
1593 if (v->cargo_cap == 0) continue; |
1593 if (v->cargo_cap == 0) continue; |
1594 |
1594 |
1595 byte load_amount = EngInfo(v->engine_type)->load_amount; |
1595 byte load_amount = EngInfo(v->engine_type)->load_amount; |
1596 if (_patches.gradual_loading && HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_LOAD_AMOUNT)) { |
1596 if (_patches.gradual_loading && HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_LOAD_AMOUNT)) { |
1597 uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v); |
1597 uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v); |
1598 if (cb_load_amount != CALLBACK_FAILED && cb_load_amount != 0) load_amount = cb_load_amount & 0xFF; |
1598 if (cb_load_amount != CALLBACK_FAILED && GB(cb_load_amount, 0, 8) != 0) load_amount = GB(cb_load_amount, 0, 8); |
1599 } |
1599 } |
1600 |
1600 |
1601 GoodsEntry *ge = &st->goods[v->cargo_type]; |
1601 GoodsEntry *ge = &st->goods[v->cargo_type]; |
1602 |
1602 |
1603 if (HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) && (u->current_order.GetUnloadType() & OUFB_NO_UNLOAD) == 0) { |
1603 if (HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) && (u->current_order.GetUnloadType() & OUFB_NO_UNLOAD) == 0) { |