716 uint32 mask = 1 << v->cargo_type; |
716 uint32 mask = 1 << v->cargo_type; |
717 |
717 |
718 if (v->cargo_cap == v->cargo_count) { |
718 if (v->cargo_cap == v->cargo_count) { |
719 full |= mask; |
719 full |= mask; |
720 } else if (GB(ge[v->cargo_type].waiting_acceptance, 0, 12) > 0 || |
720 } else if (GB(ge[v->cargo_type].waiting_acceptance, 0, 12) > 0 || |
721 (HASBIT(v->load_status, LS_CARGO_UNLOADING) && (ge[v->cargo_type].waiting_acceptance & 0x8000))) { |
721 (HASBIT(v->vehicle_flags, VF_CARGO_UNLOADING) && (ge[v->cargo_type].waiting_acceptance & 0x8000))) { |
722 /* If there is any cargo waiting, or this vehicle is still unloading |
722 /* If there is any cargo waiting, or this vehicle is still unloading |
723 * and the station accepts the cargo, don't leave the station. */ |
723 * and the station accepts the cargo, don't leave the station. */ |
724 keep_loading = true; |
724 keep_loading = true; |
725 } else { |
725 } else { |
726 not_full |= mask; |
726 not_full |= mask; |
3047 SLE_CONDVAR(Vehicle, build_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30), |
3047 SLE_CONDVAR(Vehicle, build_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30), |
3048 SLE_CONDVAR(Vehicle, build_year, SLE_INT32, 31, SL_MAX_VERSION), |
3048 SLE_CONDVAR(Vehicle, build_year, SLE_INT32, 31, SL_MAX_VERSION), |
3049 |
3049 |
3050 SLE_VAR(Vehicle, load_unload_time_rem, SLE_UINT16), |
3050 SLE_VAR(Vehicle, load_unload_time_rem, SLE_UINT16), |
3051 SLE_CONDVAR(Vehicle, cargo_paid_for, SLE_UINT16, 45, SL_MAX_VERSION), |
3051 SLE_CONDVAR(Vehicle, cargo_paid_for, SLE_UINT16, 45, SL_MAX_VERSION), |
3052 SLE_CONDVAR(Vehicle, load_status, SLE_UINT8, 40, SL_MAX_VERSION), |
3052 SLE_CONDVAR(Vehicle, vehicle_flags, SLE_UINT8, 40, SL_MAX_VERSION), |
3053 |
3053 |
3054 SLE_VAR(Vehicle, profit_this_year, SLE_INT32), |
3054 SLE_VAR(Vehicle, profit_this_year, SLE_INT32), |
3055 SLE_VAR(Vehicle, profit_last_year, SLE_INT32), |
3055 SLE_VAR(Vehicle, profit_last_year, SLE_INT32), |
|
3056 SLE_CONDVAR(Vehicle, cargo_feeder_share, SLE_INT32, 51, SL_MAX_VERSION), |
|
3057 SLE_CONDVAR(Vehicle, cargo_loaded_at_xy, SLE_UINT32, 51, SL_MAX_VERSION), |
3056 SLE_VAR(Vehicle, value, SLE_UINT32), |
3058 SLE_VAR(Vehicle, value, SLE_UINT32), |
3057 |
3059 |
3058 SLE_VAR(Vehicle, random_bits, SLE_UINT8), |
3060 SLE_VAR(Vehicle, random_bits, SLE_UINT8), |
3059 SLE_VAR(Vehicle, waiting_triggers, SLE_UINT8), |
3061 SLE_VAR(Vehicle, waiting_triggers, SLE_UINT8), |
3060 |
3062 |