equal
deleted
inserted
replaced
2942 |
2942 |
2943 uint num_cargo = CheckSavegameVersion(55) ? 12 : NUM_CARGO; |
2943 uint num_cargo = CheckSavegameVersion(55) ? 12 : NUM_CARGO; |
2944 for (CargoID i = 0; i < num_cargo; i++) { |
2944 for (CargoID i = 0; i < num_cargo; i++) { |
2945 GoodsEntry *ge = &st->goods[i]; |
2945 GoodsEntry *ge = &st->goods[i]; |
2946 SlObject(ge, _goods_desc); |
2946 SlObject(ge, _goods_desc); |
2947 if (_waiting_acceptance != 0) { |
2947 if (CheckSavegameVersion(68)) { |
2948 ge->acceptance = HASBIT(_waiting_acceptance, 15); |
2948 ge->acceptance = HASBIT(_waiting_acceptance, 15); |
2949 if (GB(_waiting_acceptance, 0, 12) != 0) { |
2949 if (GB(_waiting_acceptance, 0, 12) != 0) { |
2950 /* Don't construct the packet with station here, because that'll fail with old savegames */ |
2950 /* Don't construct the packet with station here, because that'll fail with old savegames */ |
2951 CargoPacket *cp = new CargoPacket(); |
2951 CargoPacket *cp = new CargoPacket(); |
2952 /* In old versions, enroute_from used 0xFF as INVALID_STATION */ |
2952 /* In old versions, enroute_from used 0xFF as INVALID_STATION */ |
2956 cp->feeder_share = _cargo_feeder_share; |
2956 cp->feeder_share = _cargo_feeder_share; |
2957 cp->source_xy = _cargo_source_xy; |
2957 cp->source_xy = _cargo_source_xy; |
2958 cp->days_in_transit = _cargo_days; |
2958 cp->days_in_transit = _cargo_days; |
2959 cp->feeder_share = _cargo_feeder_share; |
2959 cp->feeder_share = _cargo_feeder_share; |
2960 ge->cargo.Append(cp); |
2960 ge->cargo.Append(cp); |
|
2961 } else { |
|
2962 ge->days_since_pickup = 255; |
2961 } |
2963 } |
2962 } |
2964 } |
2963 } |
2965 } |
2964 |
2966 |
2965 if (st->num_specs != 0) { |
2967 if (st->num_specs != 0) { |